diff --git a/buildSrc/version.properties b/buildSrc/version.properties
index 420a20808d7..05dfe546f78 100644
--- a/buildSrc/version.properties
+++ b/buildSrc/version.properties
@@ -1,5 +1,5 @@
 elasticsearch     = 7.0.0
-lucene            = 8.0.0-snapshot-7e4555a2fd
+lucene            = 8.0.0-snapshot-774e9aefbc
 
 # optional dependencies
 spatial4j         = 0.7
diff --git a/modules/lang-expression/licenses/lucene-expressions-8.0.0-snapshot-774e9aefbc.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-8.0.0-snapshot-774e9aefbc.jar.sha1
new file mode 100644
index 00000000000..2e1ae79a4f7
--- /dev/null
+++ b/modules/lang-expression/licenses/lucene-expressions-8.0.0-snapshot-774e9aefbc.jar.sha1
@@ -0,0 +1 @@
+69279f27885c43662ca7216a6939dacbdf9b4795
\ No newline at end of file
diff --git a/modules/lang-expression/licenses/lucene-expressions-8.0.0-snapshot-7e4555a2fd.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-8.0.0-snapshot-7e4555a2fd.jar.sha1
deleted file mode 100644
index 70fd9bf558c..00000000000
--- a/modules/lang-expression/licenses/lucene-expressions-8.0.0-snapshot-7e4555a2fd.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-70b328502ac1cc2d27c899a642ffb2f4f1d2b9f3
\ No newline at end of file
diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.0.0-snapshot-774e9aefbc.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.0.0-snapshot-774e9aefbc.jar.sha1
new file mode 100644
index 00000000000..bb3b62e257c
--- /dev/null
+++ b/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.0.0-snapshot-774e9aefbc.jar.sha1
@@ -0,0 +1 @@
+143e925924dcc9cb8ad1b584727c2c3b6c9e5633
\ No newline at end of file
diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.0.0-snapshot-7e4555a2fd.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.0.0-snapshot-7e4555a2fd.jar.sha1
deleted file mode 100644
index f59d9fd9554..00000000000
--- a/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.0.0-snapshot-7e4555a2fd.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-643eede8327f69cf0332cecd13100536daa5f04a
\ No newline at end of file
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.0.0-snapshot-774e9aefbc.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.0.0-snapshot-774e9aefbc.jar.sha1
new file mode 100644
index 00000000000..6619c51a126
--- /dev/null
+++ b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.0.0-snapshot-774e9aefbc.jar.sha1
@@ -0,0 +1 @@
+53281a354724cf52babb0460e51d5b6ec99ecad4
\ No newline at end of file
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.0.0-snapshot-7e4555a2fd.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.0.0-snapshot-7e4555a2fd.jar.sha1
deleted file mode 100644
index 7e66613b2a5..00000000000
--- a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.0.0-snapshot-7e4555a2fd.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-191f07773cd9e8fa76914d7ba1a79292fd465230
\ No newline at end of file
diff --git a/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.0.0-snapshot-774e9aefbc.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.0.0-snapshot-774e9aefbc.jar.sha1
new file mode 100644
index 00000000000..1c3043e79f4
--- /dev/null
+++ b/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.0.0-snapshot-774e9aefbc.jar.sha1
@@ -0,0 +1 @@
+d12356cdbcf4ed17586fef5e6fd1a6ea068821b5
\ No newline at end of file
diff --git a/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.0.0-snapshot-7e4555a2fd.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.0.0-snapshot-7e4555a2fd.jar.sha1
deleted file mode 100644
index 46cc031cc5a..00000000000
--- a/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.0.0-snapshot-7e4555a2fd.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f981e4522f24af287a47e582080e6f4eae3bfbd9
\ No newline at end of file
diff --git a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.0.0-snapshot-774e9aefbc.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.0.0-snapshot-774e9aefbc.jar.sha1
new file mode 100644
index 00000000000..d1aaaa89ee9
--- /dev/null
+++ b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.0.0-snapshot-774e9aefbc.jar.sha1
@@ -0,0 +1 @@
+b0f3b0409db20717a5229bc639f703eca97ebd4c
\ No newline at end of file
diff --git a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.0.0-snapshot-7e4555a2fd.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.0.0-snapshot-7e4555a2fd.jar.sha1
deleted file mode 100644
index ef46ed664e6..00000000000
--- a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.0.0-snapshot-7e4555a2fd.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4e79b61404330b938aee53c19a7c1628b23c06e8
\ No newline at end of file
diff --git a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.0.0-snapshot-774e9aefbc.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.0.0-snapshot-774e9aefbc.jar.sha1
new file mode 100644
index 00000000000..3c9b6983643
--- /dev/null
+++ b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.0.0-snapshot-774e9aefbc.jar.sha1
@@ -0,0 +1 @@
+79f18e781a83062919eb60e06a96184ffda4a0c3
\ No newline at end of file
diff --git a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.0.0-snapshot-7e4555a2fd.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.0.0-snapshot-7e4555a2fd.jar.sha1
deleted file mode 100644
index 8e7ae277ca0..00000000000
--- a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.0.0-snapshot-7e4555a2fd.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-dbd77958185f15d27510ae554b4f91366f477e41
\ No newline at end of file
diff --git a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.0.0-snapshot-774e9aefbc.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.0.0-snapshot-774e9aefbc.jar.sha1
new file mode 100644
index 00000000000..f73173c28e3
--- /dev/null
+++ b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.0.0-snapshot-774e9aefbc.jar.sha1
@@ -0,0 +1 @@
+3c78ca17dd641a3efe1bea980e5290159867b85d
\ No newline at end of file
diff --git a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.0.0-snapshot-7e4555a2fd.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.0.0-snapshot-7e4555a2fd.jar.sha1
deleted file mode 100644
index 040c35e123b..00000000000
--- a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.0.0-snapshot-7e4555a2fd.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0b7bcb14961ad1ff22157dff78497b409fd76050
\ No newline at end of file
diff --git a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.0.0-snapshot-774e9aefbc.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.0.0-snapshot-774e9aefbc.jar.sha1
new file mode 100644
index 00000000000..d54fe8faafb
--- /dev/null
+++ b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.0.0-snapshot-774e9aefbc.jar.sha1
@@ -0,0 +1 @@
+019b424ea61617788f460218fbdd9c2107a7ff5a
\ No newline at end of file
diff --git a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.0.0-snapshot-7e4555a2fd.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.0.0-snapshot-7e4555a2fd.jar.sha1
deleted file mode 100644
index 6c4b4eab5d1..00000000000
--- a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.0.0-snapshot-7e4555a2fd.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4e2d601547ffe3e8ccc814a25ce35e3ba7e369b3
\ No newline at end of file
diff --git a/server/licenses/lucene-analyzers-common-8.0.0-snapshot-774e9aefbc.jar.sha1 b/server/licenses/lucene-analyzers-common-8.0.0-snapshot-774e9aefbc.jar.sha1
new file mode 100644
index 00000000000..b471f9fe139
--- /dev/null
+++ b/server/licenses/lucene-analyzers-common-8.0.0-snapshot-774e9aefbc.jar.sha1
@@ -0,0 +1 @@
+729c6a031e3849874028020301e1f45a05d5a0bb
\ No newline at end of file
diff --git a/server/licenses/lucene-analyzers-common-8.0.0-snapshot-7e4555a2fd.jar.sha1 b/server/licenses/lucene-analyzers-common-8.0.0-snapshot-7e4555a2fd.jar.sha1
deleted file mode 100644
index 110e4c210f6..00000000000
--- a/server/licenses/lucene-analyzers-common-8.0.0-snapshot-7e4555a2fd.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-37be26a0881a2ae009a7057d6f384b75136d98f7
\ No newline at end of file
diff --git a/server/licenses/lucene-backward-codecs-8.0.0-snapshot-774e9aefbc.jar.sha1 b/server/licenses/lucene-backward-codecs-8.0.0-snapshot-774e9aefbc.jar.sha1
new file mode 100644
index 00000000000..5c6c5cc229d
--- /dev/null
+++ b/server/licenses/lucene-backward-codecs-8.0.0-snapshot-774e9aefbc.jar.sha1
@@ -0,0 +1 @@
+5f831dea7c0bafd6306653144388a8ecd1186158
\ No newline at end of file
diff --git a/server/licenses/lucene-backward-codecs-8.0.0-snapshot-7e4555a2fd.jar.sha1 b/server/licenses/lucene-backward-codecs-8.0.0-snapshot-7e4555a2fd.jar.sha1
deleted file mode 100644
index b320767fd0b..00000000000
--- a/server/licenses/lucene-backward-codecs-8.0.0-snapshot-7e4555a2fd.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a5b18174ee3936b29218a0320b2a8b94e7150871
\ No newline at end of file
diff --git a/server/licenses/lucene-core-8.0.0-snapshot-774e9aefbc.jar.sha1 b/server/licenses/lucene-core-8.0.0-snapshot-774e9aefbc.jar.sha1
new file mode 100644
index 00000000000..2708b818d44
--- /dev/null
+++ b/server/licenses/lucene-core-8.0.0-snapshot-774e9aefbc.jar.sha1
@@ -0,0 +1 @@
+49b3ac44b6749a7ebf0c2e41a81e7910133d2fcc
\ No newline at end of file
diff --git a/server/licenses/lucene-core-8.0.0-snapshot-7e4555a2fd.jar.sha1 b/server/licenses/lucene-core-8.0.0-snapshot-7e4555a2fd.jar.sha1
deleted file mode 100644
index ef4b48a8bd6..00000000000
--- a/server/licenses/lucene-core-8.0.0-snapshot-7e4555a2fd.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-47253358ac340c35845c2a1007849db4234740da
\ No newline at end of file
diff --git a/server/licenses/lucene-grouping-8.0.0-snapshot-774e9aefbc.jar.sha1 b/server/licenses/lucene-grouping-8.0.0-snapshot-774e9aefbc.jar.sha1
new file mode 100644
index 00000000000..2c7a4912dea
--- /dev/null
+++ b/server/licenses/lucene-grouping-8.0.0-snapshot-774e9aefbc.jar.sha1
@@ -0,0 +1 @@
+0396dff0af03463e784b86fd1a24008e2f07daa2
\ No newline at end of file
diff --git a/server/licenses/lucene-grouping-8.0.0-snapshot-7e4555a2fd.jar.sha1 b/server/licenses/lucene-grouping-8.0.0-snapshot-7e4555a2fd.jar.sha1
deleted file mode 100644
index 2b60ce09d94..00000000000
--- a/server/licenses/lucene-grouping-8.0.0-snapshot-7e4555a2fd.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-98799c869205e22d903a797dcb495c31954699e0
\ No newline at end of file
diff --git a/server/licenses/lucene-highlighter-8.0.0-snapshot-774e9aefbc.jar.sha1 b/server/licenses/lucene-highlighter-8.0.0-snapshot-774e9aefbc.jar.sha1
new file mode 100644
index 00000000000..165e6dadbf5
--- /dev/null
+++ b/server/licenses/lucene-highlighter-8.0.0-snapshot-774e9aefbc.jar.sha1
@@ -0,0 +1 @@
+d552b941fef2a64ab4c9b2509906950257f92262
\ No newline at end of file
diff --git a/server/licenses/lucene-highlighter-8.0.0-snapshot-7e4555a2fd.jar.sha1 b/server/licenses/lucene-highlighter-8.0.0-snapshot-7e4555a2fd.jar.sha1
deleted file mode 100644
index 1c304157faf..00000000000
--- a/server/licenses/lucene-highlighter-8.0.0-snapshot-7e4555a2fd.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7bb476d98f9e9caf7ba62ac1b0feb791979c36c9
\ No newline at end of file
diff --git a/server/licenses/lucene-join-8.0.0-snapshot-774e9aefbc.jar.sha1 b/server/licenses/lucene-join-8.0.0-snapshot-774e9aefbc.jar.sha1
new file mode 100644
index 00000000000..d80ff31f145
--- /dev/null
+++ b/server/licenses/lucene-join-8.0.0-snapshot-774e9aefbc.jar.sha1
@@ -0,0 +1 @@
+192e9374124c14c7cd594a6f87aed61806e6e402
\ No newline at end of file
diff --git a/server/licenses/lucene-join-8.0.0-snapshot-7e4555a2fd.jar.sha1 b/server/licenses/lucene-join-8.0.0-snapshot-7e4555a2fd.jar.sha1
deleted file mode 100644
index b787c7054b9..00000000000
--- a/server/licenses/lucene-join-8.0.0-snapshot-7e4555a2fd.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a7a3562acc7f0c20ad9d24bc21f140d920de973b
\ No newline at end of file
diff --git a/server/licenses/lucene-memory-8.0.0-snapshot-774e9aefbc.jar.sha1 b/server/licenses/lucene-memory-8.0.0-snapshot-774e9aefbc.jar.sha1
new file mode 100644
index 00000000000..179dd72165f
--- /dev/null
+++ b/server/licenses/lucene-memory-8.0.0-snapshot-774e9aefbc.jar.sha1
@@ -0,0 +1 @@
+b9345c0321a3f4c7aa69ecfaf15cdee74180e409
\ No newline at end of file
diff --git a/server/licenses/lucene-memory-8.0.0-snapshot-7e4555a2fd.jar.sha1 b/server/licenses/lucene-memory-8.0.0-snapshot-7e4555a2fd.jar.sha1
deleted file mode 100644
index 4ff43ebbcba..00000000000
--- a/server/licenses/lucene-memory-8.0.0-snapshot-7e4555a2fd.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0b76d08438b959417d2372512ce6f43347085f51
\ No newline at end of file
diff --git a/server/licenses/lucene-misc-8.0.0-snapshot-774e9aefbc.jar.sha1 b/server/licenses/lucene-misc-8.0.0-snapshot-774e9aefbc.jar.sha1
new file mode 100644
index 00000000000..abfd221dcdf
--- /dev/null
+++ b/server/licenses/lucene-misc-8.0.0-snapshot-774e9aefbc.jar.sha1
@@ -0,0 +1 @@
+ace540746369ded8b2f354d35002f5ccf6a58aab
\ No newline at end of file
diff --git a/server/licenses/lucene-misc-8.0.0-snapshot-7e4555a2fd.jar.sha1 b/server/licenses/lucene-misc-8.0.0-snapshot-7e4555a2fd.jar.sha1
deleted file mode 100644
index f9b94caf6b6..00000000000
--- a/server/licenses/lucene-misc-8.0.0-snapshot-7e4555a2fd.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0ed089a34dbd66f8b153d292d6dd2a04f99ce8af
\ No newline at end of file
diff --git a/server/licenses/lucene-queries-8.0.0-snapshot-774e9aefbc.jar.sha1 b/server/licenses/lucene-queries-8.0.0-snapshot-774e9aefbc.jar.sha1
new file mode 100644
index 00000000000..7acef8ed7f8
--- /dev/null
+++ b/server/licenses/lucene-queries-8.0.0-snapshot-774e9aefbc.jar.sha1
@@ -0,0 +1 @@
+baaf3082d703c0e89ea5f131de878b586d302e34
\ No newline at end of file
diff --git a/server/licenses/lucene-queries-8.0.0-snapshot-7e4555a2fd.jar.sha1 b/server/licenses/lucene-queries-8.0.0-snapshot-7e4555a2fd.jar.sha1
deleted file mode 100644
index 4306c03c75e..00000000000
--- a/server/licenses/lucene-queries-8.0.0-snapshot-7e4555a2fd.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-59b63afbf361b9856d544d03e3117e4cd6ef1b18
\ No newline at end of file
diff --git a/server/licenses/lucene-queryparser-8.0.0-snapshot-774e9aefbc.jar.sha1 b/server/licenses/lucene-queryparser-8.0.0-snapshot-774e9aefbc.jar.sha1
new file mode 100644
index 00000000000..9e7b927a563
--- /dev/null
+++ b/server/licenses/lucene-queryparser-8.0.0-snapshot-774e9aefbc.jar.sha1
@@ -0,0 +1 @@
+799b3ffee1401fba8874b0a8ce1ab203c98d9708
\ No newline at end of file
diff --git a/server/licenses/lucene-queryparser-8.0.0-snapshot-7e4555a2fd.jar.sha1 b/server/licenses/lucene-queryparser-8.0.0-snapshot-7e4555a2fd.jar.sha1
deleted file mode 100644
index 58ea47821d1..00000000000
--- a/server/licenses/lucene-queryparser-8.0.0-snapshot-7e4555a2fd.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-63266335c7e8839d944bbc152aa110f921878cda
\ No newline at end of file
diff --git a/server/licenses/lucene-sandbox-8.0.0-snapshot-774e9aefbc.jar.sha1 b/server/licenses/lucene-sandbox-8.0.0-snapshot-774e9aefbc.jar.sha1
new file mode 100644
index 00000000000..e8bb1cbe8ca
--- /dev/null
+++ b/server/licenses/lucene-sandbox-8.0.0-snapshot-774e9aefbc.jar.sha1
@@ -0,0 +1 @@
+a6293e2d890e4b1be455524466474a3eaac8be9a
\ No newline at end of file
diff --git a/server/licenses/lucene-sandbox-8.0.0-snapshot-7e4555a2fd.jar.sha1 b/server/licenses/lucene-sandbox-8.0.0-snapshot-7e4555a2fd.jar.sha1
deleted file mode 100644
index 114cc004e0f..00000000000
--- a/server/licenses/lucene-sandbox-8.0.0-snapshot-7e4555a2fd.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4d37ca0d28dce66953bbcc4001ba08dc1af4d3b2
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial-8.0.0-snapshot-774e9aefbc.jar.sha1 b/server/licenses/lucene-spatial-8.0.0-snapshot-774e9aefbc.jar.sha1
new file mode 100644
index 00000000000..f646f423a8d
--- /dev/null
+++ b/server/licenses/lucene-spatial-8.0.0-snapshot-774e9aefbc.jar.sha1
@@ -0,0 +1 @@
+77490eb78316afdec9d0889868997777caf820c0
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial-8.0.0-snapshot-7e4555a2fd.jar.sha1 b/server/licenses/lucene-spatial-8.0.0-snapshot-7e4555a2fd.jar.sha1
deleted file mode 100644
index 6fda0117bb1..00000000000
--- a/server/licenses/lucene-spatial-8.0.0-snapshot-7e4555a2fd.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-47dfd50d6911b0a127d261068b0bfe496232e0c1
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial-extras-8.0.0-snapshot-774e9aefbc.jar.sha1 b/server/licenses/lucene-spatial-extras-8.0.0-snapshot-774e9aefbc.jar.sha1
new file mode 100644
index 00000000000..da0905ca36b
--- /dev/null
+++ b/server/licenses/lucene-spatial-extras-8.0.0-snapshot-774e9aefbc.jar.sha1
@@ -0,0 +1 @@
+4bb18049052ef738702ff5c0b294a5986971ed59
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial-extras-8.0.0-snapshot-7e4555a2fd.jar.sha1 b/server/licenses/lucene-spatial-extras-8.0.0-snapshot-7e4555a2fd.jar.sha1
deleted file mode 100644
index 2733d34103e..00000000000
--- a/server/licenses/lucene-spatial-extras-8.0.0-snapshot-7e4555a2fd.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-43f6876126ebb024e76a23d2247897d4a98c9c0f
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial3d-8.0.0-snapshot-774e9aefbc.jar.sha1 b/server/licenses/lucene-spatial3d-8.0.0-snapshot-774e9aefbc.jar.sha1
new file mode 100644
index 00000000000..60f7aaf2b53
--- /dev/null
+++ b/server/licenses/lucene-spatial3d-8.0.0-snapshot-774e9aefbc.jar.sha1
@@ -0,0 +1 @@
+936aa91d3b48bd559ee9d25303934f06aa95c1f7
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial3d-8.0.0-snapshot-7e4555a2fd.jar.sha1 b/server/licenses/lucene-spatial3d-8.0.0-snapshot-7e4555a2fd.jar.sha1
deleted file mode 100644
index 6ee59b7015d..00000000000
--- a/server/licenses/lucene-spatial3d-8.0.0-snapshot-7e4555a2fd.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b6fa3f8d933fc7c2b91acd17edf3e849a34f89d7
\ No newline at end of file
diff --git a/server/licenses/lucene-suggest-8.0.0-snapshot-774e9aefbc.jar.sha1 b/server/licenses/lucene-suggest-8.0.0-snapshot-774e9aefbc.jar.sha1
new file mode 100644
index 00000000000..1ea6540ff82
--- /dev/null
+++ b/server/licenses/lucene-suggest-8.0.0-snapshot-774e9aefbc.jar.sha1
@@ -0,0 +1 @@
+268747a9cbdebb492268aca4558968f9d46d37a9
\ No newline at end of file
diff --git a/server/licenses/lucene-suggest-8.0.0-snapshot-7e4555a2fd.jar.sha1 b/server/licenses/lucene-suggest-8.0.0-snapshot-7e4555a2fd.jar.sha1
deleted file mode 100644
index 14f415b93eb..00000000000
--- a/server/licenses/lucene-suggest-8.0.0-snapshot-7e4555a2fd.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0733cf78f94066053d3148448a565e71064515ed
\ No newline at end of file
diff --git a/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java b/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java
index d0c1ebfb0a1..bf0f704f264 100644
--- a/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java
+++ b/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java
@@ -3609,8 +3609,8 @@ public class InternalEngineTests extends EngineTestCase {
         }
         engine.refresh("test");
         try (Engine.Searcher searcher = engine.acquireSearcher("test")) {
-            TopDocs topDocs = searcher.searcher().search(new MatchAllDocsQuery(), 10);
-            assertEquals(numDocs, topDocs.totalHits.value);
+            int count = searcher.searcher().count(new MatchAllDocsQuery());
+            assertEquals(numDocs, count);
         }
         if (primary) {
             // primaries rely on lucene dedup and may index the same document twice
@@ -3716,8 +3716,8 @@ public class InternalEngineTests extends EngineTestCase {
 
         engine.refresh("test");
         try (Engine.Searcher searcher = engine.acquireSearcher("test")) {
-            TopDocs topDocs = searcher.searcher().search(new MatchAllDocsQuery(), 10);
-            assertEquals(docs.size(), topDocs.totalHits.value);
+            int count = searcher.searcher().count(new MatchAllDocsQuery());
+            assertEquals(docs.size(), count);
         }
         assertEquals(0, engine.getNumVersionLookups());
         assertEquals(0, engine.getNumIndexVersionsLookups());
diff --git a/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.0.0-snapshot-774e9aefbc.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.0.0-snapshot-774e9aefbc.jar.sha1
new file mode 100644
index 00000000000..2708b818d44
--- /dev/null
+++ b/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.0.0-snapshot-774e9aefbc.jar.sha1
@@ -0,0 +1 @@
+49b3ac44b6749a7ebf0c2e41a81e7910133d2fcc
\ No newline at end of file
diff --git a/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.0.0-snapshot-7e4555a2fd.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.0.0-snapshot-7e4555a2fd.jar.sha1
deleted file mode 100644
index ef4b48a8bd6..00000000000
--- a/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.0.0-snapshot-7e4555a2fd.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-47253358ac340c35845c2a1007849db4234740da
\ No newline at end of file