Skip to content

Commit cd5ec20

Browse files
ChrisHegartyChrisHegarty
authored
Upgrade to Lucene 9.12.1 (elastic#118300)
This commit upgrades to Lucene 9.12.1. Among the bug fixes that Lucene 9.12.1 brings, it also allows easier configuration of the Panama vectorization provider with newer Java versions. Set the org.apache.lucene.vectorization.upperJavaFeatureVersion system property to increase the set of Java versions that Panama vectorization will provide optimized implementations for. We'll need to carefully bump this sys property in the Elasticsearch 8.x series along side the JDK upgrade.
1 parent 0d9a90f commit cd5ec20

File tree

5 files changed

+84
-78
lines changed

5 files changed

+84
-78
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.18.0
2-
lucene = 9.12.0
2+
lucene = 9.12.1
33

44
bundled_jdk_vendor = openjdk
55
bundled_jdk = 23+37@3c5b90190c68498b986a97f276efd28a

‎docs/Versions.asciidoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

22
include::{docs-root}/shared/versions/stack/{source_branch}.asciidoc[]
33

4-
:lucene_version: 9.12.0
5-
:lucene_version_path: 9_12_0
4+
:lucene_version: 9.12.1
5+
:lucene_version_path: 9_12_1
66
:jdk: 11.0.2
77
:jdk_major: 11
88
:build_type: tar

‎docs/changelog/118300.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 118300
2+
summary: Upgrade to Lucene 9.12.1
3+
area: Search
4+
type: upgrade
5+
issues: []

‎gradle/verification-metadata.xml‎

Lines changed: 75 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -2920,129 +2920,129 @@
29202920
<sha256 value="015d5c229f3cd5c0ebf175c1da08d596d94043362ae9d92637d88848c90537c8" origin="Generated by Gradle"/>
29212921
</artifact>
29222922
</component>
2923-
<component group="org.apache.lucene" name="lucene-analysis-common" version="9.12.0">
2924-
<artifact name="lucene-analysis-common-9.12.0.jar">
2925-
<sha256 value="8c79d8741f711cc6d7501805b03f7b5f505805d09cab1beb95f0be24b6d27655" origin="Generated by Gradle"/>
2923+
<component group="org.apache.lucene" name="lucene-analysis-common" version="9.12.1">
2924+
<artifact name="lucene-analysis-common-9.12.1.jar">
2925+
<sha256 value="0e7534d4b6e1c3ce7af939028b3e8c1730ffb29ea5d689de2bc166c482e01b5d" origin="Generated by Gradle"/>
29262926
</artifact>
29272927
</component>
2928-
<component group="org.apache.lucene" name="lucene-analysis-icu" version="9.12.0">
2929-
<artifact name="lucene-analysis-icu-9.12.0.jar">
2930-
<sha256 value="52e914cc2d50beec8af0d07f50e5dab803cb9ce8e675ffe43a2aae6102fe6e25" origin="Generated by Gradle"/>
2928+
<component group="org.apache.lucene" name="lucene-analysis-icu" version="9.12.1">
2929+
<artifact name="lucene-analysis-icu-9.12.1.jar">
2930+
<sha256 value="27dc3353be141e9ae7ed236aeb44b5e7ff35dda45555fcbdd5d8aefb7149ab16" origin="Generated by Gradle"/>
29312931
</artifact>
29322932
</component>
2933-
<component group="org.apache.lucene" name="lucene-analysis-kuromoji" version="9.12.0">
2934-
<artifact name="lucene-analysis-kuromoji-9.12.0.jar">
2935-
<sha256 value="3da0bd68c68cfe518d0e87ea49af1a9560579bca6b9a7fdf642169cb76dd6887" origin="Generated by Gradle"/>
2933+
<component group="org.apache.lucene" name="lucene-analysis-kuromoji" version="9.12.1">
2934+
<artifact name="lucene-analysis-kuromoji-9.12.1.jar">
2935+
<sha256 value="c035ed289413071e88f64d8bac1eba2b9ac6f382e7d1684fedf3b822f23a6495" origin="Generated by Gradle"/>
29362936
</artifact>
29372937
</component>
2938-
<component group="org.apache.lucene" name="lucene-analysis-morfologik" version="9.12.0">
2939-
<artifact name="lucene-analysis-morfologik-9.12.0.jar">
2940-
<sha256 value="920358e33d806b5c3feb3566795714e1f36a616520bd2bd5da1e8b639c1f8549" origin="Generated by Gradle"/>
2938+
<component group="org.apache.lucene" name="lucene-analysis-morfologik" version="9.12.1">
2939+
<artifact name="lucene-analysis-morfologik-9.12.1.jar">
2940+
<sha256 value="6fac575c1f91b409ff82bf7d18883d0b90dc59f0b321f07036b23ed8df336663" origin="Generated by Gradle"/>
29412941
</artifact>
29422942
</component>
2943-
<component group="org.apache.lucene" name="lucene-analysis-nori" version="9.12.0">
2944-
<artifact name="lucene-analysis-nori-9.12.0.jar">
2945-
<sha256 value="26cacbe1d75e138ac0ba1e392edb1877c10a422f98524bf51d5d77492272889d" origin="Generated by Gradle"/>
2943+
<component group="org.apache.lucene" name="lucene-analysis-nori" version="9.12.1">
2944+
<artifact name="lucene-analysis-nori-9.12.1.jar">
2945+
<sha256 value="6fd6b9661a1fa1feae6c6a0d82ae8cb4e661bcb8ba1a35693ae80e4571afe5c3" origin="Generated by Gradle"/>
29462946
</artifact>
29472947
</component>
2948-
<component group="org.apache.lucene" name="lucene-analysis-phonetic" version="9.12.0">
2949-
<artifact name="lucene-analysis-phonetic-9.12.0.jar">
2950-
<sha256 value="4bb24414425e04ccd28c835e8dd7f52259185f8f671aea6432460b4b7afa5cfa" origin="Generated by Gradle"/>
2948+
<component group="org.apache.lucene" name="lucene-analysis-phonetic" version="9.12.1">
2949+
<artifact name="lucene-analysis-phonetic-9.12.1.jar">
2950+
<sha256 value="d98e2d1f6c3ef9567fe6ea6eaee339653491fda100d8df546894f2368ecfdb52" origin="Generated by Gradle"/>
29512951
</artifact>
29522952
</component>
2953-
<component group="org.apache.lucene" name="lucene-analysis-smartcn" version="9.12.0">
2954-
<artifact name="lucene-analysis-smartcn-9.12.0.jar">
2955-
<sha256 value="ffd68804d3387968784b7f52b7c14c7439fa474ffbf1b36d93fa1d2b04101f7a" origin="Generated by Gradle"/>
2953+
<component group="org.apache.lucene" name="lucene-analysis-smartcn" version="9.12.1">
2954+
<artifact name="lucene-analysis-smartcn-9.12.1.jar">
2955+
<sha256 value="c06f28b6c5e7ce77fb66ed64471683a4a2591d883415895fde36b178d692ac88" origin="Generated by Gradle"/>
29562956
</artifact>
29572957
</component>
2958-
<component group="org.apache.lucene" name="lucene-analysis-stempel" version="9.12.0">
2959-
<artifact name="lucene-analysis-stempel-9.12.0.jar">
2960-
<sha256 value="c4911b5697c0403b694aa84d3f63090067c74ffa8c95cb088d0b80e91166df4a" origin="Generated by Gradle"/>
2958+
<component group="org.apache.lucene" name="lucene-analysis-stempel" version="9.12.1">
2959+
<artifact name="lucene-analysis-stempel-9.12.1.jar">
2960+
<sha256 value="9c3078761888f091a81cbc9191685f4d3a05a4aff83991ec832cfd8bb244a42a" origin="Generated by Gradle"/>
29612961
</artifact>
29622962
</component>
2963-
<component group="org.apache.lucene" name="lucene-backward-codecs" version="9.12.0">
2964-
<artifact name="lucene-backward-codecs-9.12.0.jar">
2965-
<sha256 value="a42c17f304c9bf1e8411ebdcf91baf2df2d00c7bfa13bca9e41ccf381d78cfba" origin="Generated by Gradle"/>
2963+
<component group="org.apache.lucene" name="lucene-backward-codecs" version="9.12.1">
2964+
<artifact name="lucene-backward-codecs-9.12.1.jar">
2965+
<sha256 value="9255caa35fe9f29e97a39935118204479efde22bb23bafcd2859e296f4571792" origin="Generated by Gradle"/>
29662966
</artifact>
29672967
</component>
2968-
<component group="org.apache.lucene" name="lucene-codecs" version="9.12.0">
2969-
<artifact name="lucene-codecs-9.12.0.jar">
2970-
<sha256 value="8173a45b87df23a6dd279916cf16b361c0dcfeff5927121b014d210b19f17555" origin="Generated by Gradle"/>
2968+
<component group="org.apache.lucene" name="lucene-codecs" version="9.12.1">
2969+
<artifact name="lucene-codecs-9.12.1.jar">
2970+
<sha256 value="a1807c8351d8c53828e588cc586dbc4b6635341cd7ae401f18b5ac883821aaf0" origin="Generated by Gradle"/>
29712971
</artifact>
29722972
</component>
2973-
<component group="org.apache.lucene" name="lucene-core" version="9.12.0">
2974-
<artifact name="lucene-core-9.12.0.jar">
2975-
<sha256 value="6c7b774b75cd8f369e246f365a47caa54ae991cae6afa49c7f339e9921ca58a0" origin="Generated by Gradle"/>
2973+
<component group="org.apache.lucene" name="lucene-core" version="9.12.1">
2974+
<artifact name="lucene-core-9.12.1.jar">
2975+
<sha256 value="8d812e9fa6dbd816808205e6cb4d7ab43a747e379c8cb31a0d6dc91050b3f97a" origin="Generated by Gradle"/>
29762976
</artifact>
29772977
</component>
2978-
<component group="org.apache.lucene" name="lucene-expressions" version="9.12.0">
2979-
<artifact name="lucene-expressions-9.12.0.jar">
2980-
<sha256 value="9d14919a3d0f07420c1d57a68de52180ae2477d6255d7f693f44515a4fda9c9b" origin="Generated by Gradle"/>
2978+
<component group="org.apache.lucene" name="lucene-expressions" version="9.12.1">
2979+
<artifact name="lucene-expressions-9.12.1.jar">
2980+
<sha256 value="7fb06e21ff3fefda6a481c70f84e489670e4fec52c58d4d082103b73c6be93d3" origin="Generated by Gradle"/>
29812981
</artifact>
29822982
</component>
2983-
<component group="org.apache.lucene" name="lucene-facet" version="9.12.0">
2984-
<artifact name="lucene-facet-9.12.0.jar">
2985-
<sha256 value="3c07754f0a1f45ba42a637faa8568c18507defa6b77a1ed71af291cd4e7ac603" origin="Generated by Gradle"/>
2983+
<component group="org.apache.lucene" name="lucene-facet" version="9.12.1">
2984+
<artifact name="lucene-facet-9.12.1.jar">
2985+
<sha256 value="36910f094d21907908c65eaab6f892ef1aa11081612c652b6bfafddc7b0b1ef1" origin="Generated by Gradle"/>
29862986
</artifact>
29872987
</component>
2988-
<component group="org.apache.lucene" name="lucene-grouping" version="9.12.0">
2989-
<artifact name="lucene-grouping-9.12.0.jar">
2990-
<sha256 value="ffc02d047f4f036c5a5f409baaf8e19abca165deccc3e57e7a422560f4de1219" origin="Generated by Gradle"/>
2988+
<component group="org.apache.lucene" name="lucene-grouping" version="9.12.1">
2989+
<artifact name="lucene-grouping-9.12.1.jar">
2990+
<sha256 value="b6a93845493a275e66c776e9d567109c13b68de81cb3de067ec99637bad5551e" origin="Generated by Gradle"/>
29912991
</artifact>
29922992
</component>
2993-
<component group="org.apache.lucene" name="lucene-highlighter" version="9.12.0">
2994-
<artifact name="lucene-highlighter-9.12.0.jar">
2995-
<sha256 value="5094e1b38f02eb72500a4283ac0f654e2e81943c5359b629567dd7900c935a59" origin="Generated by Gradle"/>
2993+
<component group="org.apache.lucene" name="lucene-highlighter" version="9.12.1">
2994+
<artifact name="lucene-highlighter-9.12.1.jar">
2995+
<sha256 value="f8a4184b7b1cd490a7161887f2984856ff7de39ec2394073f884bcabccb45d69" origin="Generated by Gradle"/>
29962996
</artifact>
29972997
</component>
2998-
<component group="org.apache.lucene" name="lucene-join" version="9.12.0">
2999-
<artifact name="lucene-join-9.12.0.jar">
3000-
<sha256 value="c49cb1be843295b2c7158c03755f222416fad9915114bc7f74649d20f4fc43d6" origin="Generated by Gradle"/>
2998+
<component group="org.apache.lucene" name="lucene-join" version="9.12.1">
2999+
<artifact name="lucene-join-9.12.1.jar">
3000+
<sha256 value="e53ebf2d59c8f482ab14af07bb41ba2d3617000f7781768b7fe53b1d0e2249b0" origin="Generated by Gradle"/>
30013001
</artifact>
30023002
</component>
3003-
<component group="org.apache.lucene" name="lucene-memory" version="9.12.0">
3004-
<artifact name="lucene-memory-9.12.0.jar">
3005-
<sha256 value="fdbb9c9b3270ce06370d094f1a80dbbbf81b2638b55fa14cc817469092899f01" origin="Generated by Gradle"/>
3003+
<component group="org.apache.lucene" name="lucene-memory" version="9.12.1">
3004+
<artifact name="lucene-memory-9.12.1.jar">
3005+
<sha256 value="587363f98e410549fa5b2028b355d329231607f992303234ca1866311d9d7d29" origin="Generated by Gradle"/>
30063006
</artifact>
30073007
</component>
3008-
<component group="org.apache.lucene" name="lucene-misc" version="9.12.0">
3009-
<artifact name="lucene-misc-9.12.0.jar">
3010-
<sha256 value="7989d094b4b168ce9ef2949e13f6bfe820829944e50831881be1adeddbe02c04" origin="Generated by Gradle"/>
3008+
<component group="org.apache.lucene" name="lucene-misc" version="9.12.1">
3009+
<artifact name="lucene-misc-9.12.1.jar">
3010+
<sha256 value="0d5c9476758191a3e4c07db977a9cdc56dba3cfac026ee79d03756e81a17e16a" origin="Generated by Gradle"/>
30113011
</artifact>
30123012
</component>
3013-
<component group="org.apache.lucene" name="lucene-queries" version="9.12.0">
3014-
<artifact name="lucene-queries-9.12.0.jar">
3015-
<sha256 value="3b4da6b1673e4edd141c7b86538cc61f6ff3386106f1f5e179c9fe2d30ea2fca" origin="Generated by Gradle"/>
3013+
<component group="org.apache.lucene" name="lucene-queries" version="9.12.1">
3014+
<artifact name="lucene-queries-9.12.1.jar">
3015+
<sha256 value="3630f4d53203d62152cdb993a7b4f9d4e52cff2688ba549ad09cc01d5d78b5f8" origin="Generated by Gradle"/>
30163016
</artifact>
30173017
</component>
3018-
<component group="org.apache.lucene" name="lucene-queryparser" version="9.12.0">
3019-
<artifact name="lucene-queryparser-9.12.0.jar">
3020-
<sha256 value="fc866b7bbfc199436feb24be7dd5c575445342eb283bfe07dd519eab131d3675" origin="Generated by Gradle"/>
3018+
<component group="org.apache.lucene" name="lucene-queryparser" version="9.12.1">
3019+
<artifact name="lucene-queryparser-9.12.1.jar">
3020+
<sha256 value="9746eb991203553ade09491ac49415e3711ec32e4ad3cd705d8d9620a32192dd" origin="Generated by Gradle"/>
30213021
</artifact>
30223022
</component>
3023-
<component group="org.apache.lucene" name="lucene-sandbox" version="9.12.0">
3024-
<artifact name="lucene-sandbox-9.12.0.jar">
3025-
<sha256 value="2262f39a241f435dba61f230e7528205c34f4bf0008faa57f0808476bb782996" origin="Generated by Gradle"/>
3023+
<component group="org.apache.lucene" name="lucene-sandbox" version="9.12.1">
3024+
<artifact name="lucene-sandbox-9.12.1.jar">
3025+
<sha256 value="9aa00ce942216d513352dae89cf8588c6bdd379f82a5d8a30d8652535bd58aae" origin="Generated by Gradle"/>
30263026
</artifact>
30273027
</component>
3028-
<component group="org.apache.lucene" name="lucene-spatial-extras" version="9.12.0">
3029-
<artifact name="lucene-spatial-extras-9.12.0.jar">
3030-
<sha256 value="ea41de3b2da573e488033b8b1c2033e17c27ce39957cf6acb8904297ae6e1747" origin="Generated by Gradle"/>
3028+
<component group="org.apache.lucene" name="lucene-spatial-extras" version="9.12.1">
3029+
<artifact name="lucene-spatial-extras-9.12.1.jar">
3030+
<sha256 value="d9d180a559147e20ed0c1f27bc4e0daf4518b46fce19829eb397c0f07b06f54a" origin="Generated by Gradle"/>
30313031
</artifact>
30323032
</component>
3033-
<component group="org.apache.lucene" name="lucene-spatial3d" version="9.12.0">
3034-
<artifact name="lucene-spatial3d-9.12.0.jar">
3035-
<sha256 value="4263e163937024838a8761618b1ce4eba06857adca0c9385d1ac014ec2937de6" origin="Generated by Gradle"/>
3033+
<component group="org.apache.lucene" name="lucene-spatial3d" version="9.12.1">
3034+
<artifact name="lucene-spatial3d-9.12.1.jar">
3035+
<sha256 value="920d541ee609bc36b7f999761a3055622fa08631445616825a0c1ce2d72857cf" origin="Generated by Gradle"/>
30363036
</artifact>
30373037
</component>
3038-
<component group="org.apache.lucene" name="lucene-suggest" version="9.12.0">
3039-
<artifact name="lucene-suggest-9.12.0.jar">
3040-
<sha256 value="1606fb9c7cf57d88b2824916c00280c92e14bcde798a6b78b27e0db8f13227f0" origin="Generated by Gradle"/>
3038+
<component group="org.apache.lucene" name="lucene-suggest" version="9.12.1">
3039+
<artifact name="lucene-suggest-9.12.1.jar">
3040+
<sha256 value="6894de92b80e294a07041447caa5bb13d5dee33fe6ff05270afc3e0d1be40140" origin="Generated by Gradle"/>
30413041
</artifact>
30423042
</component>
3043-
<component group="org.apache.lucene" name="lucene-test-framework" version="9.12.0">
3044-
<artifact name="lucene-test-framework-9.12.0.jar">
3045-
<sha256 value="47d4e1f47ebd26117d47af8fbff471c116c571fd7d7bd6cb199d89f8454e5cf0" origin="Generated by Gradle"/>
3043+
<component group="org.apache.lucene" name="lucene-test-framework" version="9.12.1">
3044+
<artifact name="lucene-test-framework-9.12.1.jar">
3045+
<sha256 value="62a906edd2648bc173ba86301257d8490af71b986f0abe2323cd0e596402cce1" origin="Generated by Gradle"/>
30463046
</artifact>
30473047
</component>
30483048
<component group="org.apache.maven" name="maven-api-meta" version="4.0.0-alpha-9">

‎server/src/main/java/org/elasticsearch/index/IndexVersions.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ private static IndexVersion def(int id, Version luceneVersion) {
123123
public static final IndexVersion TIME_BASED_K_ORDERED_DOC_ID_BACKPORT = def(8_520_00_0, Version.LUCENE_9_12_0);
124124
public static final IndexVersion DEPRECATE_SOURCE_MODE_MAPPER = def(8_521_00_0, Version.LUCENE_9_12_0);
125125
public static final IndexVersion USE_SYNTHETIC_SOURCE_FOR_RECOVERY_BACKPORT = def(8_522_00_0, Version.LUCENE_9_12_0);
126+
public static final IndexVersion UPGRADE_TO_LUCENE_9_12_1 = def(8_523_00_0, Version.LUCENE_9_12_1);
126127
/*
127128
* STOP! READ THIS FIRST! No, really,
128129
* ____ _____ ___ ____ _ ____ _____ _ ____ _____ _ _ ___ ____ _____ ___ ____ ____ _____ _

0 commit comments

Comments
 (0)