[8.12.1] Upgrade to Lucene 9.9.2 (elastic#104761)

This commit upgrades to Lucene 9.9.2.
jimczi · Jan 30, 2024 · 4dc7d46 · 4dc7d46
1 parent c64900e
commit 4dc7d46
Show file tree

Hide file tree

Showing 5 changed files with 81 additions and 75 deletions.
diff --git a/build-tools-internal/version.properties b/build-tools-internal/version.properties
@@ -1,5 +1,5 @@
 elasticsearch     = 8.12.1
-lucene            = 9.9.1
+lucene            = 9.9.2
 
 bundled_jdk_vendor = openjdk
 bundled_jdk = 21.0.2+13@f2283984656d49d69e91c558476027ac

diff --git a/docs/Versions.asciidoc b/docs/Versions.asciidoc
@@ -1,8 +1,8 @@
 
 include::{docs-root}/shared/versions/stack/{source_branch}.asciidoc[]
 
-:lucene_version:        9.9.1
-:lucene_version_path:   9_9_1
+:lucene_version:        9.9.2
+:lucene_version_path:   9_9_2
 :jdk:                   11.0.2
 :jdk_major:             11
 :build_type:            tar

diff --git a/docs/changelog/104761.yaml b/docs/changelog/104761.yaml
@@ -0,0 +1,5 @@
+pr: 104761
+summary: "[8.12.1] Upgrade to Lucene 9.9.2"
+area: Search
+type: upgrade
+issues: []
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -2628,124 +2628,124 @@
             <sha256 value="015d5c229f3cd5c0ebf175c1da08d596d94043362ae9d92637d88848c90537c8" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-analysis-common" version="9.9.1">
-         <artifact name="lucene-analysis-common-9.9.1.jar">
-            <sha256 value="b25800d416ab405c8fd8b7c52d96c1bd69613052d3e76ec0250b856fe812c288" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-analysis-common" version="9.9.2">
+         <artifact name="lucene-analysis-common-9.9.2.jar">
+            <sha256 value="0083066fd7c0df1d6ce41906edb52314c4d0cbd18c45387cb3cac3d75a043f57" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-analysis-icu" version="9.9.1">
-         <artifact name="lucene-analysis-icu-9.9.1.jar">
-            <sha256 value="69b32bc4abdd6ad3a9f3ee518d58ab0f5cd06afe369022d02bbea54682d451ee" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-analysis-icu" version="9.9.2">
+         <artifact name="lucene-analysis-icu-9.9.2.jar">
+            <sha256 value="9cc68d2b4ff8655f50f34d5a2bc762d5ae6ca9423f0974417dec4ddf4879601c" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-analysis-kuromoji" version="9.9.1">
-         <artifact name="lucene-analysis-kuromoji-9.9.1.jar">
-            <sha256 value="b3ad035e14b60df149d7a994b4ed52760f3cb92b5d71a6e2b7b9a5fa3499aa06" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-analysis-kuromoji" version="9.9.2">
+         <artifact name="lucene-analysis-kuromoji-9.9.2.jar">
+            <sha256 value="707865547e6b4cb267eba892ddd49d398395aba4e2079b31976ad46146c0ecc7" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-analysis-morfologik" version="9.9.1">
-         <artifact name="lucene-analysis-morfologik-9.9.1.jar">
-            <sha256 value="d2ea0f39d941487e5ac51888297f602e6fad10ba4dca6bdaa8fa3fbd7aa03e47" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-analysis-morfologik" version="9.9.2">
+         <artifact name="lucene-analysis-morfologik-9.9.2.jar">
+            <sha256 value="b1c0f79f2959f1f324c6abb5a576ffbe0b649fa12c1ad430285a9d2a0d76c74f" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-analysis-nori" version="9.9.1">
-         <artifact name="lucene-analysis-nori-9.9.1.jar">
-            <sha256 value="d6f8bd6b1c3248d874168bc08a9f97d420fe692082a53cb02e5d7a08e9d10036" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-analysis-nori" version="9.9.2">
+         <artifact name="lucene-analysis-nori-9.9.2.jar">
+            <sha256 value="e612a21101e515916b6e007cf116a6e51092d3d4feb9ae7275a4457ca7e29223" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-analysis-phonetic" version="9.9.1">
-         <artifact name="lucene-analysis-phonetic-9.9.1.jar">
-            <sha256 value="1547e69ffd9c6aa408413c9609f267658d8183b69c3a116b791b2a48ee267064" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-analysis-phonetic" version="9.9.2">
+         <artifact name="lucene-analysis-phonetic-9.9.2.jar">
+            <sha256 value="53f358a90bdf2d11b8e0d9f35bc52b32594fe6849d0a3e2a1a636f9457cf7ee2" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-analysis-smartcn" version="9.9.1">
-         <artifact name="lucene-analysis-smartcn-9.9.1.jar">
-            <sha256 value="982588e36a2fbf4ac2e0ce4fb04437e46abe660eb91d0b10bc5579c14b437611" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-analysis-smartcn" version="9.9.2">
+         <artifact name="lucene-analysis-smartcn-9.9.2.jar">
+            <sha256 value="d0cdb47585b7e51da61ab8220d19527c67f1c9d2b645e06c1b6683dc11080d01" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-analysis-stempel" version="9.9.1">
-         <artifact name="lucene-analysis-stempel-9.9.1.jar">
-            <sha256 value="74a444e426badca05b58c875b46343c27e7612c4ff99478a0c9990f93e0cb190" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-analysis-stempel" version="9.9.2">
+         <artifact name="lucene-analysis-stempel-9.9.2.jar">
+            <sha256 value="2e1fd26afd520f8f7aba3a24b0efe563f5e6c701defc84ba5680e861aaef0b3c" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-backward-codecs" version="9.9.1">
-         <artifact name="lucene-backward-codecs-9.9.1.jar">
-            <sha256 value="3d5b346494e50417c8bb1028bf9696ec3a0df0339e7228701b097cbf033a89df" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-backward-codecs" version="9.9.2">
+         <artifact name="lucene-backward-codecs-9.9.2.jar">
+            <sha256 value="be4202f59b8eb85fab82309c0c31d44fe783509991152c3a87c8b14d3fa55de9" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-codecs" version="9.9.1">
-         <artifact name="lucene-codecs-9.9.1.jar">
-            <sha256 value="dfbdb0a0896ee962857f67dafd6d1995413e532ee990c42862267d4d40ab5596" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-codecs" version="9.9.2">
+         <artifact name="lucene-codecs-9.9.2.jar">
+            <sha256 value="22a5bfc9ed11c2f3ebb3abfbdde2ad8db9f0b8a1d3c81ce6b796ccae23506b05" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-core" version="9.9.1">
-         <artifact name="lucene-core-9.9.1.jar">
-            <sha256 value="9f44696c6985875ab01ce29bd994ac0f275a5d3624b2bcbcd447786f0062ce76" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-core" version="9.9.2">
+         <artifact name="lucene-core-9.9.2.jar">
+            <sha256 value="ee9edc77fd8089210b8da2f244028ee1cf815077e2eab084f0a625fe9f9cdbbe" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-expressions" version="9.9.1">
-         <artifact name="lucene-expressions-9.9.1.jar">
-            <sha256 value="c3454adc5beb0995e8797db79080890ac5460cd3173fafbcbe3287ee8fa7a9fc" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-expressions" version="9.9.2">
+         <artifact name="lucene-expressions-9.9.2.jar">
+            <sha256 value="f2ef490145674afe3b09f4b63a8346ccacfd42d69dc079b345c870b338c17645" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-grouping" version="9.9.1">
-         <artifact name="lucene-grouping-9.9.1.jar">
-            <sha256 value="47d2cf918ea81bdc604d20cfe999c739e2c1c802db1e919db74316cdd154be32" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-grouping" version="9.9.2">
+         <artifact name="lucene-grouping-9.9.2.jar">
+            <sha256 value="79bd43d3278d15c7894ef89f4fd547b2c2752b525f6014f148d0f0728ca5c0df" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-highlighter" version="9.9.1">
-         <artifact name="lucene-highlighter-9.9.1.jar">
-            <sha256 value="e97b6d1eb12c260dcf07d47adea20dc7fa4c74acc36d357a7e7656e81780a3b4" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-highlighter" version="9.9.2">
+         <artifact name="lucene-highlighter-9.9.2.jar">
+            <sha256 value="c79b95bf5450f0270e09e7a184bc8a763075d9da5fbf106a198b0a0b9457127f" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-join" version="9.9.1">
-         <artifact name="lucene-join-9.9.1.jar">
-            <sha256 value="006b24f1c1fdc575e04dce45c46217d7cfa4026ff3e59f9944cffdffe211980e" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-join" version="9.9.2">
+         <artifact name="lucene-join-9.9.2.jar">
+            <sha256 value="93651d612ae34f9fb13b391f56861d36b42cbf374983590bce7caa48645e065d" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-memory" version="9.9.1">
-         <artifact name="lucene-memory-9.9.1.jar">
-            <sha256 value="72c1d9eb99c4341447ce05c5d979866cfc44b482bbba9a76dfd73f5e890cbbe4" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-memory" version="9.9.2">
+         <artifact name="lucene-memory-9.9.2.jar">
+            <sha256 value="a051a8f9d3b8a25541297f52db41330daee7c0ebda2d1d318a81c80e22edeaef" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-misc" version="9.9.1">
-         <artifact name="lucene-misc-9.9.1.jar">
-            <sha256 value="35a4f37327afa2bbee7ab71b8dee8ba3f4356997309c15b48e8b52684d05ca0c" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-misc" version="9.9.2">
+         <artifact name="lucene-misc-9.9.2.jar">
+            <sha256 value="dc13173328b2db8aa635d95829717e8b7ee650cbc2407b7918a7b3a4ecaf8124" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-queries" version="9.9.1">
-         <artifact name="lucene-queries-9.9.1.jar">
-            <sha256 value="6d655e52321616d4e80ce2b3c8cc0e51892cb5e03b968b234adaeb1273471183" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-queries" version="9.9.2">
+         <artifact name="lucene-queries-9.9.2.jar">
+            <sha256 value="e97d34018d179741f715895d30c75e5d8555b631150d7cf95d5b3e9a3902b75a" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-queryparser" version="9.9.1">
-         <artifact name="lucene-queryparser-9.9.1.jar">
-            <sha256 value="5b9ae7177f402a0c28bfe7910e8e6b12c19ada071e0ee7464e719e63c0319bd4" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-queryparser" version="9.9.2">
+         <artifact name="lucene-queryparser-9.9.2.jar">
+            <sha256 value="ddb0a0ca074caeafc2bff4a21cf402faf7fbef11b5e1419e52e83566878141cb" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-sandbox" version="9.9.1">
-         <artifact name="lucene-sandbox-9.9.1.jar">
-            <sha256 value="3a9bba4d702070c96c0ddc6f3d7b814194229cadf959f594c1e6d025dadf0c42" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-sandbox" version="9.9.2">
+         <artifact name="lucene-sandbox-9.9.2.jar">
+            <sha256 value="d6c86af29befa5ae1e48423ac0b74a690f12219cbc0d49fada3c77d5fed96198" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-spatial-extras" version="9.9.1">
-         <artifact name="lucene-spatial-extras-9.9.1.jar">
-            <sha256 value="b37afa4e60df5ff81f00a55663c7b2867b9a79fd36882bae58d9bfe19da7ca13" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-spatial-extras" version="9.9.2">
+         <artifact name="lucene-spatial-extras-9.9.2.jar">
+            <sha256 value="6596cbedf716bed53009c7509a638a6dfccb7f52d8d01a1e3ad28bea59aaa412" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-spatial3d" version="9.9.1">
-         <artifact name="lucene-spatial3d-9.9.1.jar">
-            <sha256 value="91b2a04c34fa32519cd777dbaf1ef62ae4d14ecbcd5dad02f056884a83b43227" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-spatial3d" version="9.9.2">
+         <artifact name="lucene-spatial3d-9.9.2.jar">
+            <sha256 value="52b217a8d6f4658615f5e685ba218f7f3981f3e87eb670d64527b7fffb88e27b" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-suggest" version="9.9.1">
-         <artifact name="lucene-suggest-9.9.1.jar">
-            <sha256 value="a94a72156b2ebe91b955d5cf7e2a3d28f7cc456baa1e7908e2edc22be288c2b8" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-suggest" version="9.9.2">
+         <artifact name="lucene-suggest-9.9.2.jar">
+            <sha256 value="1fd7dda42b54385b68650b33d408ad8f8f407cf044d29683d6ce3308a43d60eb" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.apache.lucene" name="lucene-test-framework" version="9.9.1">
-         <artifact name="lucene-test-framework-9.9.1.jar">
-            <sha256 value="1d73b57063949c02532e296a602a5c822028e8cab2f21a12cebb84026755aea5" origin="Generated by Gradle"/>
+      <component group="org.apache.lucene" name="lucene-test-framework" version="9.9.2">
+         <artifact name="lucene-test-framework-9.9.2.jar">
+            <sha256 value="6ad54aaac89aa6b1f9db43f0757ea40af4a4dd77606bcb84ab9f7732763321a6" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.apache.maven" name="maven-artifact" version="3.6.1">

diff --git a/server/src/main/java/org/elasticsearch/index/IndexVersions.java b/server/src/main/java/org/elasticsearch/index/IndexVersions.java
@@ -95,6 +95,7 @@ private static IndexVersion def(int id, Version luceneVersion) {
     public static final IndexVersion NORI_DUPLICATES = def(8_500_007, Version.LUCENE_9_9_0);
     public static final IndexVersion UPGRADE_LUCENE_9_9_1 = def(8_500_008, Version.LUCENE_9_9_1);
     public static final IndexVersion ES_VERSION_8_12_1 = def(8_500_009, Version.LUCENE_9_9_1);
+    public static final IndexVersion UPGRADE_8_12_1_LUCENE_9_9_2 = def(8_500_010, Version.LUCENE_9_9_2);
 
     /*
      * STOP! READ THIS FIRST! No, really,