diff --git a/build-tools-internal/version.properties b/build-tools-internal/version.properties
index 465882509d77..8db18b63c36b 100644
--- a/build-tools-internal/version.properties
+++ b/build-tools-internal/version.properties
@@ -1,5 +1,5 @@
 elasticsearch     = 8.0.0
-lucene            = 9.0.0-snapshot-8b68bf60c98
+lucene            = 9.0.0-snapshot-2719cf6630e
 
 bundled_jdk_vendor = adoptium
 bundled_jdk = 17+35
diff --git a/modules/lang-expression/licenses/lucene-expressions-9.0.0-snapshot-2719cf6630e.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-9.0.0-snapshot-2719cf6630e.jar.sha1
new file mode 100644
index 000000000000..0fb855d15dd4
--- /dev/null
+++ b/modules/lang-expression/licenses/lucene-expressions-9.0.0-snapshot-2719cf6630e.jar.sha1
@@ -0,0 +1 @@
+293fe996ddfcd57d1431bb73f0b59d077b946374
\ No newline at end of file
diff --git a/modules/lang-expression/licenses/lucene-expressions-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-9.0.0-snapshot-8b68bf60c98.jar.sha1
deleted file mode 100644
index d92d8f3fc6b2..000000000000
--- a/modules/lang-expression/licenses/lucene-expressions-9.0.0-snapshot-8b68bf60c98.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-93676b57287ef17b5eda8f0ab5aa91ac27781b30
\ No newline at end of file
diff --git a/modules/legacy-geo/licenses/lucene-spatial-extras-9.0.0-snapshot-2719cf6630e.jar.sha1 b/modules/legacy-geo/licenses/lucene-spatial-extras-9.0.0-snapshot-2719cf6630e.jar.sha1
new file mode 100644
index 000000000000..3347628c0e8f
--- /dev/null
+++ b/modules/legacy-geo/licenses/lucene-spatial-extras-9.0.0-snapshot-2719cf6630e.jar.sha1
@@ -0,0 +1 @@
+16f30f67a13f3a947000bbe1a189b0bdbccc6ec3
\ No newline at end of file
diff --git a/modules/legacy-geo/licenses/lucene-spatial-extras-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/modules/legacy-geo/licenses/lucene-spatial-extras-9.0.0-snapshot-8b68bf60c98.jar.sha1
deleted file mode 100644
index a3ea1b0fef52..000000000000
--- a/modules/legacy-geo/licenses/lucene-spatial-extras-9.0.0-snapshot-8b68bf60c98.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-fabf62d18d45d4eb4e6199005f92624233b3f2e4
\ No newline at end of file
diff --git a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.0.0-snapshot-2719cf6630e.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.0.0-snapshot-2719cf6630e.jar.sha1
new file mode 100644
index 000000000000..07c46ac055ea
--- /dev/null
+++ b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.0.0-snapshot-2719cf6630e.jar.sha1
@@ -0,0 +1 @@
+7d029029ce95599bd791a07fb8c9e2f00865d7a5
\ No newline at end of file
diff --git a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.0.0-snapshot-8b68bf60c98.jar.sha1
deleted file mode 100644
index 19406d09ecf1..000000000000
--- a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.0.0-snapshot-8b68bf60c98.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c5b251c26358225271e6901ae8e62f2b7b9a6e98
\ No newline at end of file
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.0.0-snapshot-2719cf6630e.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.0.0-snapshot-2719cf6630e.jar.sha1
new file mode 100644
index 000000000000..742b6f43722a
--- /dev/null
+++ b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.0.0-snapshot-2719cf6630e.jar.sha1
@@ -0,0 +1 @@
+aaae0ea657ebedc350402dd3344e56e33c79724d
\ No newline at end of file
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.0.0-snapshot-8b68bf60c98.jar.sha1
deleted file mode 100644
index f40fc403c553..000000000000
--- a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.0.0-snapshot-8b68bf60c98.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-07e69528347205991aa8b9724170c6bb4a61b0b0
\ No newline at end of file
diff --git a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.0.0-snapshot-2719cf6630e.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.0.0-snapshot-2719cf6630e.jar.sha1
new file mode 100644
index 000000000000..767290ec95e3
--- /dev/null
+++ b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.0.0-snapshot-2719cf6630e.jar.sha1
@@ -0,0 +1 @@
+f2499fe88398e457a801cfd393db90f12b2ff149
\ No newline at end of file
diff --git a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.0.0-snapshot-8b68bf60c98.jar.sha1
deleted file mode 100644
index 3540eb801f1a..000000000000
--- a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.0.0-snapshot-8b68bf60c98.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f170e5a8a8105c7eb747ab77ee3a91247f1704b1
\ No newline at end of file
diff --git a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.0.0-snapshot-2719cf6630e.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.0.0-snapshot-2719cf6630e.jar.sha1
new file mode 100644
index 000000000000..1742ae6d503c
--- /dev/null
+++ b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.0.0-snapshot-2719cf6630e.jar.sha1
@@ -0,0 +1 @@
+49e196efaf31e16aadbf8a630df705929b7778c9
\ No newline at end of file
diff --git a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.0.0-snapshot-8b68bf60c98.jar.sha1
deleted file mode 100644
index 308d0978017d..000000000000
--- a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.0.0-snapshot-8b68bf60c98.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e1c03aa49d6dc9c5f194446ba1ac39504628456e
\ No newline at end of file
diff --git a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.0.0-snapshot-2719cf6630e.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.0.0-snapshot-2719cf6630e.jar.sha1
new file mode 100644
index 000000000000..1565583d925a
--- /dev/null
+++ b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.0.0-snapshot-2719cf6630e.jar.sha1
@@ -0,0 +1 @@
+d76ed543a88428e9c78b30b91050768acb26c7a7
\ No newline at end of file
diff --git a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.0.0-snapshot-8b68bf60c98.jar.sha1
deleted file mode 100644
index 0e0de95bafd1..000000000000
--- a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.0.0-snapshot-8b68bf60c98.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-62b1dcdb25704edf95e634a810f8aa36aaac99ab
\ No newline at end of file
diff --git a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.0.0-snapshot-2719cf6630e.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.0.0-snapshot-2719cf6630e.jar.sha1
new file mode 100644
index 000000000000..bab205f782a0
--- /dev/null
+++ b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.0.0-snapshot-2719cf6630e.jar.sha1
@@ -0,0 +1 @@
+039d1d5ba495418bb0079083a17ed3345948a8aa
\ No newline at end of file
diff --git a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.0.0-snapshot-8b68bf60c98.jar.sha1
deleted file mode 100644
index 0fb07bd6f735..000000000000
--- a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.0.0-snapshot-8b68bf60c98.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-10cf350a47eb30b615a7fd9bf740ad5e45017a2d
\ No newline at end of file
diff --git a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.0.0-snapshot-2719cf6630e.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.0.0-snapshot-2719cf6630e.jar.sha1
new file mode 100644
index 000000000000..bfbc0e77505f
--- /dev/null
+++ b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.0.0-snapshot-2719cf6630e.jar.sha1
@@ -0,0 +1 @@
+788516cec7f01c6e6c4bbb5df2eb1b9963312827
\ No newline at end of file
diff --git a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.0.0-snapshot-8b68bf60c98.jar.sha1
deleted file mode 100644
index 04a4d5df07de..000000000000
--- a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.0.0-snapshot-8b68bf60c98.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-839cd3dcb679d53239860f88a70c970a4b30c93a
\ No newline at end of file
diff --git a/server/licenses/lucene-analysis-common-9.0.0-snapshot-2719cf6630e.jar.sha1 b/server/licenses/lucene-analysis-common-9.0.0-snapshot-2719cf6630e.jar.sha1
new file mode 100644
index 000000000000..3776178ca7cd
--- /dev/null
+++ b/server/licenses/lucene-analysis-common-9.0.0-snapshot-2719cf6630e.jar.sha1
@@ -0,0 +1 @@
+f20ab3e51a047780cae90d452f1e252ad04c9fdc
\ No newline at end of file
diff --git a/server/licenses/lucene-analysis-common-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/server/licenses/lucene-analysis-common-9.0.0-snapshot-8b68bf60c98.jar.sha1
deleted file mode 100644
index 1d5734eb988f..000000000000
--- a/server/licenses/lucene-analysis-common-9.0.0-snapshot-8b68bf60c98.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0f73e4a59da39da41511bb960212398d82e64a97
\ No newline at end of file
diff --git a/server/licenses/lucene-backward-codecs-9.0.0-snapshot-2719cf6630e.jar.sha1 b/server/licenses/lucene-backward-codecs-9.0.0-snapshot-2719cf6630e.jar.sha1
new file mode 100644
index 000000000000..49ee9f92f4cb
--- /dev/null
+++ b/server/licenses/lucene-backward-codecs-9.0.0-snapshot-2719cf6630e.jar.sha1
@@ -0,0 +1 @@
+92c3693907074392d6c4ce52eb2cfdc66f58bdd1
\ No newline at end of file
diff --git a/server/licenses/lucene-backward-codecs-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/server/licenses/lucene-backward-codecs-9.0.0-snapshot-8b68bf60c98.jar.sha1
deleted file mode 100644
index 773ae4902d25..000000000000
--- a/server/licenses/lucene-backward-codecs-9.0.0-snapshot-8b68bf60c98.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ec67313245fcdb584b98790b6798a59f2f171f39
\ No newline at end of file
diff --git a/server/licenses/lucene-core-9.0.0-snapshot-2719cf6630e.jar.sha1 b/server/licenses/lucene-core-9.0.0-snapshot-2719cf6630e.jar.sha1
new file mode 100644
index 000000000000..11aa9e6d1719
--- /dev/null
+++ b/server/licenses/lucene-core-9.0.0-snapshot-2719cf6630e.jar.sha1
@@ -0,0 +1 @@
+39c998e0de591232e0ca7e5c219e204369a185fc
\ No newline at end of file
diff --git a/server/licenses/lucene-core-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/server/licenses/lucene-core-9.0.0-snapshot-8b68bf60c98.jar.sha1
deleted file mode 100644
index 6815a521b728..000000000000
--- a/server/licenses/lucene-core-9.0.0-snapshot-8b68bf60c98.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6f5d5f4968f6e2f066a532d0c7a8ed0fbb9aec7d
\ No newline at end of file
diff --git a/server/licenses/lucene-grouping-9.0.0-snapshot-2719cf6630e.jar.sha1 b/server/licenses/lucene-grouping-9.0.0-snapshot-2719cf6630e.jar.sha1
new file mode 100644
index 000000000000..37c51ab1a717
--- /dev/null
+++ b/server/licenses/lucene-grouping-9.0.0-snapshot-2719cf6630e.jar.sha1
@@ -0,0 +1 @@
+6e7b0916a72d74fd2f0304ddb4e0a9549e9a050c
\ No newline at end of file
diff --git a/server/licenses/lucene-grouping-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/server/licenses/lucene-grouping-9.0.0-snapshot-8b68bf60c98.jar.sha1
deleted file mode 100644
index 08e04201d60e..000000000000
--- a/server/licenses/lucene-grouping-9.0.0-snapshot-8b68bf60c98.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2992847af15ee3b61b543bddd0e501f3fe178c6f
\ No newline at end of file
diff --git a/server/licenses/lucene-highlighter-9.0.0-snapshot-2719cf6630e.jar.sha1 b/server/licenses/lucene-highlighter-9.0.0-snapshot-2719cf6630e.jar.sha1
new file mode 100644
index 000000000000..d79b277dfd33
--- /dev/null
+++ b/server/licenses/lucene-highlighter-9.0.0-snapshot-2719cf6630e.jar.sha1
@@ -0,0 +1 @@
+69d9eab228ed733706e61b4ab42d11b4f0d400c5
\ No newline at end of file
diff --git a/server/licenses/lucene-highlighter-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/server/licenses/lucene-highlighter-9.0.0-snapshot-8b68bf60c98.jar.sha1
deleted file mode 100644
index dffe5d7260c5..000000000000
--- a/server/licenses/lucene-highlighter-9.0.0-snapshot-8b68bf60c98.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-530f39370fc0c7b6bc837d3232204670ac62c8e1
\ No newline at end of file
diff --git a/server/licenses/lucene-join-9.0.0-snapshot-2719cf6630e.jar.sha1 b/server/licenses/lucene-join-9.0.0-snapshot-2719cf6630e.jar.sha1
new file mode 100644
index 000000000000..aa69d85859c8
--- /dev/null
+++ b/server/licenses/lucene-join-9.0.0-snapshot-2719cf6630e.jar.sha1
@@ -0,0 +1 @@
+68e29074313f808d6fe927ef0f03958f17530d7b
\ No newline at end of file
diff --git a/server/licenses/lucene-join-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/server/licenses/lucene-join-9.0.0-snapshot-8b68bf60c98.jar.sha1
deleted file mode 100644
index 9f21794438d0..000000000000
--- a/server/licenses/lucene-join-9.0.0-snapshot-8b68bf60c98.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7368570d058183ccc3d1c5e1d62750ade07162da
\ No newline at end of file
diff --git a/server/licenses/lucene-memory-9.0.0-snapshot-2719cf6630e.jar.sha1 b/server/licenses/lucene-memory-9.0.0-snapshot-2719cf6630e.jar.sha1
new file mode 100644
index 000000000000..28d296f5cdf2
--- /dev/null
+++ b/server/licenses/lucene-memory-9.0.0-snapshot-2719cf6630e.jar.sha1
@@ -0,0 +1 @@
+fd74375aba476634a523942339cd86035348cebc
\ No newline at end of file
diff --git a/server/licenses/lucene-memory-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/server/licenses/lucene-memory-9.0.0-snapshot-8b68bf60c98.jar.sha1
deleted file mode 100644
index 6b660dbcc30b..000000000000
--- a/server/licenses/lucene-memory-9.0.0-snapshot-8b68bf60c98.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-148d1bb8a7ff899d082a03e3fab3004e270603c1
\ No newline at end of file
diff --git a/server/licenses/lucene-misc-9.0.0-snapshot-2719cf6630e.jar.sha1 b/server/licenses/lucene-misc-9.0.0-snapshot-2719cf6630e.jar.sha1
new file mode 100644
index 000000000000..d8c6010ef769
--- /dev/null
+++ b/server/licenses/lucene-misc-9.0.0-snapshot-2719cf6630e.jar.sha1
@@ -0,0 +1 @@
+ca38208d31f839ba48f7a3a672b6fe5a5a3993a5
\ No newline at end of file
diff --git a/server/licenses/lucene-misc-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/server/licenses/lucene-misc-9.0.0-snapshot-8b68bf60c98.jar.sha1
deleted file mode 100644
index f76923a9ce96..000000000000
--- a/server/licenses/lucene-misc-9.0.0-snapshot-8b68bf60c98.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-920bc15625ec49f1656cde591a071f4798974158
\ No newline at end of file
diff --git a/server/licenses/lucene-queries-9.0.0-snapshot-2719cf6630e.jar.sha1 b/server/licenses/lucene-queries-9.0.0-snapshot-2719cf6630e.jar.sha1
new file mode 100644
index 000000000000..2b86a77ce663
--- /dev/null
+++ b/server/licenses/lucene-queries-9.0.0-snapshot-2719cf6630e.jar.sha1
@@ -0,0 +1 @@
+7b69ddea4bff7f803c8920df64abf2c69425ffe1
\ No newline at end of file
diff --git a/server/licenses/lucene-queries-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/server/licenses/lucene-queries-9.0.0-snapshot-8b68bf60c98.jar.sha1
deleted file mode 100644
index 9fb827c8b5c0..000000000000
--- a/server/licenses/lucene-queries-9.0.0-snapshot-8b68bf60c98.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-61561472420037e0cead34ac14cc93ec948ddca5
\ No newline at end of file
diff --git a/server/licenses/lucene-queryparser-9.0.0-snapshot-2719cf6630e.jar.sha1 b/server/licenses/lucene-queryparser-9.0.0-snapshot-2719cf6630e.jar.sha1
new file mode 100644
index 000000000000..4c3d2594357f
--- /dev/null
+++ b/server/licenses/lucene-queryparser-9.0.0-snapshot-2719cf6630e.jar.sha1
@@ -0,0 +1 @@
+c4e256dbaf37d6b4e71e8bdced5a25ad8a37f3d7
\ No newline at end of file
diff --git a/server/licenses/lucene-queryparser-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/server/licenses/lucene-queryparser-9.0.0-snapshot-8b68bf60c98.jar.sha1
deleted file mode 100644
index ae5c8276a7e6..000000000000
--- a/server/licenses/lucene-queryparser-9.0.0-snapshot-8b68bf60c98.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e90bbf2465f7f7fc1c606076d17a69bf7b455439
\ No newline at end of file
diff --git a/server/licenses/lucene-sandbox-9.0.0-snapshot-2719cf6630e.jar.sha1 b/server/licenses/lucene-sandbox-9.0.0-snapshot-2719cf6630e.jar.sha1
new file mode 100644
index 000000000000..5a98316fb0fb
--- /dev/null
+++ b/server/licenses/lucene-sandbox-9.0.0-snapshot-2719cf6630e.jar.sha1
@@ -0,0 +1 @@
+10d5c40ca9394fd3071408cf59288ede444f9fcc
\ No newline at end of file
diff --git a/server/licenses/lucene-sandbox-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/server/licenses/lucene-sandbox-9.0.0-snapshot-8b68bf60c98.jar.sha1
deleted file mode 100644
index c6ba51b1055c..000000000000
--- a/server/licenses/lucene-sandbox-9.0.0-snapshot-8b68bf60c98.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e67b37e3d5e6fa59eef529f5a24598958006de7e
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial3d-9.0.0-snapshot-2719cf6630e.jar.sha1 b/server/licenses/lucene-spatial3d-9.0.0-snapshot-2719cf6630e.jar.sha1
new file mode 100644
index 000000000000..41e4a5a3eaeb
--- /dev/null
+++ b/server/licenses/lucene-spatial3d-9.0.0-snapshot-2719cf6630e.jar.sha1
@@ -0,0 +1 @@
+797172aca57c1b704045d2937bb20b5aa3b3d711
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial3d-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/server/licenses/lucene-spatial3d-9.0.0-snapshot-8b68bf60c98.jar.sha1
deleted file mode 100644
index d4009aa5f5e2..000000000000
--- a/server/licenses/lucene-spatial3d-9.0.0-snapshot-8b68bf60c98.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-062e6ecea21b4281d720910e486ed04012ae8b18
\ No newline at end of file
diff --git a/server/licenses/lucene-suggest-9.0.0-snapshot-2719cf6630e.jar.sha1 b/server/licenses/lucene-suggest-9.0.0-snapshot-2719cf6630e.jar.sha1
new file mode 100644
index 000000000000..956e1abf1d2a
--- /dev/null
+++ b/server/licenses/lucene-suggest-9.0.0-snapshot-2719cf6630e.jar.sha1
@@ -0,0 +1 @@
+6dc3975b1276bdd908dd4134b4c53ca2983613c4
\ No newline at end of file
diff --git a/server/licenses/lucene-suggest-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/server/licenses/lucene-suggest-9.0.0-snapshot-8b68bf60c98.jar.sha1
deleted file mode 100644
index eb5311d0b185..000000000000
--- a/server/licenses/lucene-suggest-9.0.0-snapshot-8b68bf60c98.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ade0398fa44d77e59842e40f76ec2910be1f5492
\ No newline at end of file
diff --git a/server/src/main/java/org/elasticsearch/lucene/search/uhighlight/CustomUnifiedHighlighter.java b/server/src/main/java/org/elasticsearch/lucene/search/uhighlight/CustomUnifiedHighlighter.java
index 6272620da6d3..596cb483c9db 100644
--- a/server/src/main/java/org/elasticsearch/lucene/search/uhighlight/CustomUnifiedHighlighter.java
+++ b/server/src/main/java/org/elasticsearch/lucene/search/uhighlight/CustomUnifiedHighlighter.java
@@ -38,6 +38,7 @@ import java.io.IOException;
 import java.text.BreakIterator;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.EnumSet;
 import java.util.Locale;
 import java.util.Set;
 import java.util.function.Predicate;
@@ -169,6 +170,21 @@ public class CustomUnifiedHighlighter extends UnifiedHighlighter {
             getScorer(field), maxPassages, (noMatchSize > 0 ? 1 : 0), getFormatter(field), noMatchSize);
     }
 
+    @Override
+    protected Set<HighlightFlag> getFlags(String field) {
+        Set<HighlightFlag> highlightFlags = EnumSet.noneOf(HighlightFlag.class);
+        if (shouldHandleMultiTermQuery(field)) {
+            highlightFlags.add(HighlightFlag.MULTI_TERM_QUERY);
+        }
+        if (shouldHighlightPhrasesStrictly(field)) {
+            highlightFlags.add(HighlightFlag.PHRASES);
+        }
+        if (shouldPreferPassageRelevancyOverSpeed(field)) {
+            highlightFlags.add(HighlightFlag.PASSAGE_RELEVANCY_OVER_SPEED);
+        }
+        return highlightFlags;
+    }
+
     @Override
     protected Collection<Query> preSpanQueryRewrite(Query query) {
         return rewriteCustomQuery(query);
diff --git a/x-pack/plugin/sql/sql-action/licenses/lucene-core-9.0.0-snapshot-2719cf6630e.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/lucene-core-9.0.0-snapshot-2719cf6630e.jar.sha1
new file mode 100644
index 000000000000..11aa9e6d1719
--- /dev/null
+++ b/x-pack/plugin/sql/sql-action/licenses/lucene-core-9.0.0-snapshot-2719cf6630e.jar.sha1
@@ -0,0 +1 @@
+39c998e0de591232e0ca7e5c219e204369a185fc
\ No newline at end of file
diff --git a/x-pack/plugin/sql/sql-action/licenses/lucene-core-9.0.0-snapshot-8b68bf60c98.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/lucene-core-9.0.0-snapshot-8b68bf60c98.jar.sha1
deleted file mode 100644
index 6815a521b728..000000000000
--- a/x-pack/plugin/sql/sql-action/licenses/lucene-core-9.0.0-snapshot-8b68bf60c98.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6f5d5f4968f6e2f066a532d0c7a8ed0fbb9aec7d
\ No newline at end of file