Skip to content

Commit 04c4738

Browse files
jpountzjpountz
authored
Upgrade to Lucene 9.7.0. (elastic#97073) (elastic#97156)
This is the official release, and is very close to the snapshot we're currently on.
1 parent 69a089e commit 04c4738

File tree

5 files changed

+73
-76
lines changed

5 files changed

+73
-76
lines changed

‎build-tools-internal/version.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
elasticsearch = 8.9.0
2-
lucene = 9.7.0-snapshot-41cd1f7a88c
2+
lucene = 9.7.0
33

44
bundled_jdk_vendor = openjdk
55
bundled_jdk = 20.0.1+9@b4887098932d415489976708ad6d1a4b

‎gradle/verification-metadata.xml‎

Lines changed: 72 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -2488,124 +2488,124 @@
24882488
<sha256 value="015d5c229f3cd5c0ebf175c1da08d596d94043362ae9d92637d88848c90537c8" origin="Generated by Gradle"/>
24892489
</artifact>
24902490
</component>
2491-
<component group="org.apache.lucene" name="lucene-analysis-common" version="9.7.0-snapshot-41cd1f7a88c">
2492-
<artifact name="lucene-analysis-common-9.7.0-snapshot-41cd1f7a88c.jar">
2493-
<sha256 value="dc54c36b1a6e51d6a39f70e760570d1aaa17558980b09a4aab06da64f932dd62" origin="Generated by Gradle"/>
2491+
<component group="org.apache.lucene" name="lucene-analysis-common" version="9.7.0">
2492+
<artifact name="lucene-analysis-common-9.7.0.jar">
2493+
<sha256 value="87abf0221c526d64616d47d2261866620c8f42659c93dbfd0d1ffb138af98137" origin="Generated by Gradle"/>
24942494
</artifact>
24952495
</component>
2496-
<component group="org.apache.lucene" name="lucene-analysis-icu" version="9.7.0-snapshot-41cd1f7a88c">
2497-
<artifact name="lucene-analysis-icu-9.7.0-snapshot-41cd1f7a88c.jar">
2498-
<sha256 value="184899387f830c370e4c2814eb11cd4cd630f6257fab3db56fa21d55ac845adf" origin="Generated by Gradle"/>
2496+
<component group="org.apache.lucene" name="lucene-analysis-icu" version="9.7.0">
2497+
<artifact name="lucene-analysis-icu-9.7.0.jar">
2498+
<sha256 value="6be5ebff01ee2ca840d4483bd2ab3f768e48a3f3b5d166b21801ce49ffb30d88" origin="Generated by Gradle"/>
24992499
</artifact>
25002500
</component>
2501-
<component group="org.apache.lucene" name="lucene-analysis-kuromoji" version="9.7.0-snapshot-41cd1f7a88c">
2502-
<artifact name="lucene-analysis-kuromoji-9.7.0-snapshot-41cd1f7a88c.jar">
2503-
<sha256 value="6233a2a517a748522fe44683778dc0566f2d2a427203a092fdb842154b545662" origin="Generated by Gradle"/>
2501+
<component group="org.apache.lucene" name="lucene-analysis-kuromoji" version="9.7.0">
2502+
<artifact name="lucene-analysis-kuromoji-9.7.0.jar">
2503+
<sha256 value="2aabdfa1b91cde65fae16b3e1b8ba58bd9400cdba338e610c8345cb8a0bf3d08" origin="Generated by Gradle"/>
25042504
</artifact>
25052505
</component>
2506-
<component group="org.apache.lucene" name="lucene-analysis-morfologik" version="9.7.0-snapshot-41cd1f7a88c">
2507-
<artifact name="lucene-analysis-morfologik-9.7.0-snapshot-41cd1f7a88c.jar">
2508-
<sha256 value="103359e987ecc2b3f119bdf891428bc6a54f4371cb730a6b6c83aaf73119eec5" origin="Generated by Gradle"/>
2506+
<component group="org.apache.lucene" name="lucene-analysis-morfologik" version="9.7.0">
2507+
<artifact name="lucene-analysis-morfologik-9.7.0.jar">
2508+
<sha256 value="74e3421253268418854bc48684c2d59442e9864b95ff4a15d27510b64ff456fe" origin="Generated by Gradle"/>
25092509
</artifact>
25102510
</component>
2511-
<component group="org.apache.lucene" name="lucene-analysis-nori" version="9.7.0-snapshot-41cd1f7a88c">
2512-
<artifact name="lucene-analysis-nori-9.7.0-snapshot-41cd1f7a88c.jar">
2513-
<sha256 value="83ac1452b550571171d321adb1fad4e7da1a29d7408346825e3137bad84e12f5" origin="Generated by Gradle"/>
2511+
<component group="org.apache.lucene" name="lucene-analysis-nori" version="9.7.0">
2512+
<artifact name="lucene-analysis-nori-9.7.0.jar">
2513+
<sha256 value="986c4912423181d356b2f5302facefedd25261507c586903f1c024d6f6df9ea9" origin="Generated by Gradle"/>
25142514
</artifact>
25152515
</component>
2516-
<component group="org.apache.lucene" name="lucene-analysis-phonetic" version="9.7.0-snapshot-41cd1f7a88c">
2517-
<artifact name="lucene-analysis-phonetic-9.7.0-snapshot-41cd1f7a88c.jar">
2518-
<sha256 value="5e09eefd06c708604994c142fd0a1ee52315d02aa318bf3cbc25771e247a8f67" origin="Generated by Gradle"/>
2516+
<component group="org.apache.lucene" name="lucene-analysis-phonetic" version="9.7.0">
2517+
<artifact name="lucene-analysis-phonetic-9.7.0.jar">
2518+
<sha256 value="f7f4cf684f13a55c5c1ac99eac5253926380b598b3f38afa602a494b5fb3185e" origin="Generated by Gradle"/>
25192519
</artifact>
25202520
</component>
2521-
<component group="org.apache.lucene" name="lucene-analysis-smartcn" version="9.7.0-snapshot-41cd1f7a88c">
2522-
<artifact name="lucene-analysis-smartcn-9.7.0-snapshot-41cd1f7a88c.jar">
2523-
<sha256 value="3c28f3d2daa5e467ee44efb1b345f2aacffc790b6af40ae577ccc941fcddc735" origin="Generated by Gradle"/>
2521+
<component group="org.apache.lucene" name="lucene-analysis-smartcn" version="9.7.0">
2522+
<artifact name="lucene-analysis-smartcn-9.7.0.jar">
2523+
<sha256 value="be6b87805ac45ea1f0054c000730452bda4da57ef6ba43f694e44c381555240a" origin="Generated by Gradle"/>
25242524
</artifact>
25252525
</component>
2526-
<component group="org.apache.lucene" name="lucene-analysis-stempel" version="9.7.0-snapshot-41cd1f7a88c">
2527-
<artifact name="lucene-analysis-stempel-9.7.0-snapshot-41cd1f7a88c.jar">
2528-
<sha256 value="38674e2413c6097a1557abb18ed88aa9fd41624ccecd9d301cdf4bacfd3bff97" origin="Generated by Gradle"/>
2526+
<component group="org.apache.lucene" name="lucene-analysis-stempel" version="9.7.0">
2527+
<artifact name="lucene-analysis-stempel-9.7.0.jar">
2528+
<sha256 value="d9753a9c47b84a0b881116cd5d93e89d69fb8ea22d96e18a7368bb88c2922431" origin="Generated by Gradle"/>
25292529
</artifact>
25302530
</component>
2531-
<component group="org.apache.lucene" name="lucene-backward-codecs" version="9.7.0-snapshot-41cd1f7a88c">
2532-
<artifact name="lucene-backward-codecs-9.7.0-snapshot-41cd1f7a88c.jar">
2533-
<sha256 value="858c1f5bc5403d35f4783e3de50058d54ebce24eba13e61705c0b898ababc801" origin="Generated by Gradle"/>
2531+
<component group="org.apache.lucene" name="lucene-backward-codecs" version="9.7.0">
2532+
<artifact name="lucene-backward-codecs-9.7.0.jar">
2533+
<sha256 value="084abc348cd1e5ebc8c8e3b857e2c76ed87ccc715cfe08075d15d7da85e9fc37" origin="Generated by Gradle"/>
25342534
</artifact>
25352535
</component>
2536-
<component group="org.apache.lucene" name="lucene-codecs" version="9.7.0-snapshot-41cd1f7a88c">
2537-
<artifact name="lucene-codecs-9.7.0-snapshot-41cd1f7a88c.jar">
2538-
<sha256 value="c90eae3399f31f5b5b70590dbd4e2d444c772cb93a64414b9a56564efa424bb5" origin="Generated by Gradle"/>
2536+
<component group="org.apache.lucene" name="lucene-codecs" version="9.7.0">
2537+
<artifact name="lucene-codecs-9.7.0.jar">
2538+
<sha256 value="3ca7745ebd45b4f3dfa50253fa639a07094b7a7d6c2e0334ef12da3fdcd36506" origin="Generated by Gradle"/>
25392539
</artifact>
25402540
</component>
2541-
<component group="org.apache.lucene" name="lucene-core" version="9.7.0-snapshot-41cd1f7a88c">
2542-
<artifact name="lucene-core-9.7.0-snapshot-41cd1f7a88c.jar">
2543-
<sha256 value="334596f8dd6e5d03624d8ac31a9f024c65358a50ca6810bbbaedc8841481ee46" origin="Generated by Gradle"/>
2541+
<component group="org.apache.lucene" name="lucene-core" version="9.7.0">
2542+
<artifact name="lucene-core-9.7.0.jar">
2543+
<sha256 value="624d7f544afefcbc382f2d9c8fe9e04fb5626c6fb579b584663baf43df1653f8" origin="Generated by Gradle"/>
25442544
</artifact>
25452545
</component>
2546-
<component group="org.apache.lucene" name="lucene-expressions" version="9.7.0-snapshot-41cd1f7a88c">
2547-
<artifact name="lucene-expressions-9.7.0-snapshot-41cd1f7a88c.jar">
2548-
<sha256 value="b4048f71261d04ac795ca19e607e74e3c733912247b037e00cebcee9204c0df4" origin="Generated by Gradle"/>
2546+
<component group="org.apache.lucene" name="lucene-expressions" version="9.7.0">
2547+
<artifact name="lucene-expressions-9.7.0.jar">
2548+
<sha256 value="39d85e367b169aec323b7d897f38880124ef08131182c160e55e0bbce0648659" origin="Generated by Gradle"/>
25492549
</artifact>
25502550
</component>
2551-
<component group="org.apache.lucene" name="lucene-grouping" version="9.7.0-snapshot-41cd1f7a88c">
2552-
<artifact name="lucene-grouping-9.7.0-snapshot-41cd1f7a88c.jar">
2553-
<sha256 value="e5710ec50aa5ea1414141c17fe10e87e4c5980d66890f17a61ddd6eaef37cf4c" origin="Generated by Gradle"/>
2551+
<component group="org.apache.lucene" name="lucene-grouping" version="9.7.0">
2552+
<artifact name="lucene-grouping-9.7.0.jar">
2553+
<sha256 value="e11309b1468d086858e62d04084bdd8431b15eb13d8654afade547146e1d266d" origin="Generated by Gradle"/>
25542554
</artifact>
25552555
</component>
2556-
<component group="org.apache.lucene" name="lucene-highlighter" version="9.7.0-snapshot-41cd1f7a88c">
2557-
<artifact name="lucene-highlighter-9.7.0-snapshot-41cd1f7a88c.jar">
2558-
<sha256 value="50d98c27c521cb40642e41903dc20bb0fae61159528b7d3d503726e2326c4496" origin="Generated by Gradle"/>
2556+
<component group="org.apache.lucene" name="lucene-highlighter" version="9.7.0">
2557+
<artifact name="lucene-highlighter-9.7.0.jar">
2558+
<sha256 value="5e85aeb68a79849a3742c2d2194b6b2b031b9fc36a72d78b7d07a210d4d4dbb5" origin="Generated by Gradle"/>
25592559
</artifact>
25602560
</component>
2561-
<component group="org.apache.lucene" name="lucene-join" version="9.7.0-snapshot-41cd1f7a88c">
2562-
<artifact name="lucene-join-9.7.0-snapshot-41cd1f7a88c.jar">
2563-
<sha256 value="8174a381295deba79dca2bc70e11e895a558e04314db6ad7ffa4190fc450c67e" origin="Generated by Gradle"/>
2561+
<component group="org.apache.lucene" name="lucene-join" version="9.7.0">
2562+
<artifact name="lucene-join-9.7.0.jar">
2563+
<sha256 value="57028972c1e1def7efdc9308752c85dcae64fba1eedb53dd538f0b8336567d0a" origin="Generated by Gradle"/>
25642564
</artifact>
25652565
</component>
2566-
<component group="org.apache.lucene" name="lucene-memory" version="9.7.0-snapshot-41cd1f7a88c">
2567-
<artifact name="lucene-memory-9.7.0-snapshot-41cd1f7a88c.jar">
2568-
<sha256 value="687f3ac2d9586c3d5d1c1a12d296265a1e2f6fe62e6f3110eb63306b426d83c5" origin="Generated by Gradle"/>
2566+
<component group="org.apache.lucene" name="lucene-memory" version="9.7.0">
2567+
<artifact name="lucene-memory-9.7.0.jar">
2568+
<sha256 value="8ad121401befe64c6e1cf5ed43600c2a63b673c39b28b6669515208e65ea3723" origin="Generated by Gradle"/>
25692569
</artifact>
25702570
</component>
2571-
<component group="org.apache.lucene" name="lucene-misc" version="9.7.0-snapshot-41cd1f7a88c">
2572-
<artifact name="lucene-misc-9.7.0-snapshot-41cd1f7a88c.jar">
2573-
<sha256 value="cce3e0cb150c5b5223a3643749858b5093ee0ecbb410d52d25d5aed161f7e2c0" origin="Generated by Gradle"/>
2571+
<component group="org.apache.lucene" name="lucene-misc" version="9.7.0">
2572+
<artifact name="lucene-misc-9.7.0.jar">
2573+
<sha256 value="613580ca90d73bf2a1ec1319eb1e146d0ec02461cd07838afdf36e8c8a8724bf" origin="Generated by Gradle"/>
25742574
</artifact>
25752575
</component>
2576-
<component group="org.apache.lucene" name="lucene-queries" version="9.7.0-snapshot-41cd1f7a88c">
2577-
<artifact name="lucene-queries-9.7.0-snapshot-41cd1f7a88c.jar">
2578-
<sha256 value="53f64d898bd8563e4ff102de79fe0d1b4589a678f1155bf2aab98cb38a71385e" origin="Generated by Gradle"/>
2576+
<component group="org.apache.lucene" name="lucene-queries" version="9.7.0">
2577+
<artifact name="lucene-queries-9.7.0.jar">
2578+
<sha256 value="1ef397f798888ed8a0bbe9d5d0f2d76cd72bfa2c1bafe3b0f9a5c849dda91acb" origin="Generated by Gradle"/>
25792579
</artifact>
25802580
</component>
2581-
<component group="org.apache.lucene" name="lucene-queryparser" version="9.7.0-snapshot-41cd1f7a88c">
2582-
<artifact name="lucene-queryparser-9.7.0-snapshot-41cd1f7a88c.jar">
2583-
<sha256 value="7f6d2fbcc4522a9dcb57006cd753907a3439023add3a86586942c60e2b032b67" origin="Generated by Gradle"/>
2581+
<component group="org.apache.lucene" name="lucene-queryparser" version="9.7.0">
2582+
<artifact name="lucene-queryparser-9.7.0.jar">
2583+
<sha256 value="01b48a489d337c0fcc5a5e5bff09f076cd075ec619035ebc05135beff914b57a" origin="Generated by Gradle"/>
25842584
</artifact>
25852585
</component>
2586-
<component group="org.apache.lucene" name="lucene-sandbox" version="9.7.0-snapshot-41cd1f7a88c">
2587-
<artifact name="lucene-sandbox-9.7.0-snapshot-41cd1f7a88c.jar">
2588-
<sha256 value="c34508a739d481a787df484bfa056f7f02a4c037fee93ee89337f6fe639d01da" origin="Generated by Gradle"/>
2586+
<component group="org.apache.lucene" name="lucene-sandbox" version="9.7.0">
2587+
<artifact name="lucene-sandbox-9.7.0.jar">
2588+
<sha256 value="07686ece4db37546ca3d89ecb1836d73df5f4f88d807f203cd302a4c7467c53f" origin="Generated by Gradle"/>
25892589
</artifact>
25902590
</component>
2591-
<component group="org.apache.lucene" name="lucene-spatial-extras" version="9.7.0-snapshot-41cd1f7a88c">
2592-
<artifact name="lucene-spatial-extras-9.7.0-snapshot-41cd1f7a88c.jar">
2593-
<sha256 value="30933d9265ec2bb1022cad1320a332be4e42289bffd83fdd8630539f84806387" origin="Generated by Gradle"/>
2591+
<component group="org.apache.lucene" name="lucene-spatial-extras" version="9.7.0">
2592+
<artifact name="lucene-spatial-extras-9.7.0.jar">
2593+
<sha256 value="b1ab439fd1cbf0c10003ce6ca835fe48150c5ed2186747f7bf96234e8696dc10" origin="Generated by Gradle"/>
25942594
</artifact>
25952595
</component>
2596-
<component group="org.apache.lucene" name="lucene-spatial3d" version="9.7.0-snapshot-41cd1f7a88c">
2597-
<artifact name="lucene-spatial3d-9.7.0-snapshot-41cd1f7a88c.jar">
2598-
<sha256 value="f85895acf2fefc38db65538ad11e0bba9e30a23dc36a5b3e630c9a5da6e799d4" origin="Generated by Gradle"/>
2596+
<component group="org.apache.lucene" name="lucene-spatial3d" version="9.7.0">
2597+
<artifact name="lucene-spatial3d-9.7.0.jar">
2598+
<sha256 value="98c0fe52ae5384953e7101cc576b21604583a85654604736402c77281d13fd8e" origin="Generated by Gradle"/>
25992599
</artifact>
26002600
</component>
2601-
<component group="org.apache.lucene" name="lucene-suggest" version="9.7.0-snapshot-41cd1f7a88c">
2602-
<artifact name="lucene-suggest-9.7.0-snapshot-41cd1f7a88c.jar">
2603-
<sha256 value="0bc82ca849ead94f9b2f1981c6a2c6c3737172a3219e9425a4ca6baf3ba33632" origin="Generated by Gradle"/>
2601+
<component group="org.apache.lucene" name="lucene-suggest" version="9.7.0">
2602+
<artifact name="lucene-suggest-9.7.0.jar">
2603+
<sha256 value="0a0d2ca3d2f9151a50eef6db276c531f39f1cff9bf61628f2fc3287c39272dbb" origin="Generated by Gradle"/>
26042604
</artifact>
26052605
</component>
2606-
<component group="org.apache.lucene" name="lucene-test-framework" version="9.7.0-snapshot-41cd1f7a88c">
2607-
<artifact name="lucene-test-framework-9.7.0-snapshot-41cd1f7a88c.jar">
2608-
<sha256 value="d330f1971e52fca545da2dcb44e00e1702e2c47f8448cbce5f0230c1a7b085c5" origin="Generated by Gradle"/>
2606+
<component group="org.apache.lucene" name="lucene-test-framework" version="9.7.0">
2607+
<artifact name="lucene-test-framework-9.7.0.jar">
2608+
<sha256 value="963a2df07fbd06bdc56fe42ac0686f0b949dc2d9eb8da2faf1ab4c21b113d017" origin="Generated by Gradle"/>
26092609
</artifact>
26102610
</component>
26112611
<component group="org.apache.maven" name="maven-model" version="3.6.2">

‎server/src/main/java/org/elasticsearch/index/query/CombinedFieldsQueryBuilder.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import org.apache.lucene.search.similarities.Similarity;
2222
import org.apache.lucene.util.BytesRef;
2323
import org.apache.lucene.util.QueryBuilder;
24-
import org.apache.lucene.util.TermAndBoost;
2524
import org.elasticsearch.TransportVersion;
2625
import org.elasticsearch.common.Strings;
2726
import org.elasticsearch.common.io.stream.StreamInput;

‎server/src/main/java/org/elasticsearch/index/search/MatchQueryParser.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import org.apache.lucene.search.MultiTermQuery;
2929
import org.apache.lucene.search.Query;
3030
import org.apache.lucene.util.QueryBuilder;
31-
import org.apache.lucene.util.TermAndBoost;
3231
import org.apache.lucene.util.graph.GraphTokenStreamFiniteStrings;
3332
import org.elasticsearch.ElasticsearchException;
3433
import org.elasticsearch.common.io.stream.StreamInput;

‎server/src/main/java/org/elasticsearch/index/search/MultiMatchQueryParser.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import org.apache.lucene.search.Query;
1919
import org.apache.lucene.search.TermQuery;
2020
import org.apache.lucene.util.BytesRef;
21-
import org.apache.lucene.util.TermAndBoost;
2221
import org.elasticsearch.common.lucene.search.Queries;
2322
import org.elasticsearch.index.mapper.MappedFieldType;
2423
import org.elasticsearch.index.query.AbstractQueryBuilder;

0 commit comments

Comments
 (0)