diff --git a/build-tools-internal/version.properties b/build-tools-internal/version.properties index 3e7e1981d104a..8d024789dd2f7 100644 --- a/build-tools-internal/version.properties +++ b/build-tools-internal/version.properties @@ -1,5 +1,5 @@ elasticsearch = 8.4.0 -lucene = 9.3.0-snapshot-2d05f5c623e +lucene = 9.3.0-snapshot-b8d1fcfd0ec bundled_jdk_vendor = openjdk bundled_jdk = 18.0.2+9@f6ad4b4450fd4d298113270ec84f30ee diff --git a/modules/lang-expression/licenses/lucene-codecs-9.3.0-snapshot-2d05f5c623e.jar.sha1 b/modules/lang-expression/licenses/lucene-codecs-9.3.0-snapshot-2d05f5c623e.jar.sha1 deleted file mode 100644 index f164594b811ce..0000000000000 --- a/modules/lang-expression/licenses/lucene-codecs-9.3.0-snapshot-2d05f5c623e.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a2b0a4e1d763c5575f289ef7b4d8f109e7ee895f \ No newline at end of file diff --git a/modules/lang-expression/licenses/lucene-codecs-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 b/modules/lang-expression/licenses/lucene-codecs-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 new file mode 100644 index 0000000000000..47b8df46111d4 --- /dev/null +++ b/modules/lang-expression/licenses/lucene-codecs-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 @@ -0,0 +1 @@ +f9d91e4de3468b4c513a82a3d20d9d19137c4311 \ No newline at end of file diff --git a/modules/lang-expression/licenses/lucene-expressions-9.3.0-snapshot-2d05f5c623e.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-9.3.0-snapshot-2d05f5c623e.jar.sha1 deleted file mode 100644 index 98efd688cf3ac..0000000000000 --- a/modules/lang-expression/licenses/lucene-expressions-9.3.0-snapshot-2d05f5c623e.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -37603372705778c2c755d055ac72f835af0ebe51 \ No newline at end of file diff --git a/modules/lang-expression/licenses/lucene-expressions-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 new file mode 100644 index 0000000000000..544a44a26debb --- /dev/null +++ b/modules/lang-expression/licenses/lucene-expressions-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 @@ -0,0 +1 @@ +b146dc1d898b3f638328a4d6a64f68cfede251ec \ No newline at end of file diff --git a/modules/legacy-geo/licenses/lucene-spatial-extras-9.3.0-snapshot-2d05f5c623e.jar.sha1 b/modules/legacy-geo/licenses/lucene-spatial-extras-9.3.0-snapshot-2d05f5c623e.jar.sha1 deleted file mode 100644 index 75358a122c5aa..0000000000000 --- a/modules/legacy-geo/licenses/lucene-spatial-extras-9.3.0-snapshot-2d05f5c623e.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -899069409ff5a448c641700a0371ce792a0635b1 \ No newline at end of file diff --git a/modules/legacy-geo/licenses/lucene-spatial-extras-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 b/modules/legacy-geo/licenses/lucene-spatial-extras-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 new file mode 100644 index 0000000000000..5e9c50d838196 --- /dev/null +++ b/modules/legacy-geo/licenses/lucene-spatial-extras-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 @@ -0,0 +1 @@ +f87c4435a856c612a5799fa89397364a7b2d6f7e \ No newline at end of file diff --git a/modules/legacy-geo/licenses/lucene-spatial3d-9.3.0-snapshot-2d05f5c623e.jar.sha1 b/modules/legacy-geo/licenses/lucene-spatial3d-9.3.0-snapshot-2d05f5c623e.jar.sha1 deleted file mode 100644 index 6017afff2e6cc..0000000000000 --- a/modules/legacy-geo/licenses/lucene-spatial3d-9.3.0-snapshot-2d05f5c623e.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -3416a5a2becfd987049453c939afa2624c3db6c7 \ No newline at end of file diff --git a/modules/legacy-geo/licenses/lucene-spatial3d-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 b/modules/legacy-geo/licenses/lucene-spatial3d-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 new file mode 100644 index 0000000000000..6c74a9716f82f --- /dev/null +++ b/modules/legacy-geo/licenses/lucene-spatial3d-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 @@ -0,0 +1 @@ +110e8b2e5bced4b8f482ac58a2cf9cd64591b028 \ No newline at end of file diff --git a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.3.0-snapshot-2d05f5c623e.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.3.0-snapshot-2d05f5c623e.jar.sha1 deleted file mode 100644 index 73d5dfdcae436..0000000000000 --- a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.3.0-snapshot-2d05f5c623e.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -87772b1d9907c63287d7bc79cf8fa3e9a46c9c77 \ No newline at end of file diff --git a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 new file mode 100644 index 0000000000000..ceea8ba4f6855 --- /dev/null +++ b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 @@ -0,0 +1 @@ +501aa4f0028424a994b06627f30ffb36150ffbe2 \ No newline at end of file diff --git a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.3.0-snapshot-2d05f5c623e.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.3.0-snapshot-2d05f5c623e.jar.sha1 deleted file mode 100644 index 7b95a9396dd9e..0000000000000 --- a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.3.0-snapshot-2d05f5c623e.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a58272a5eb0137dbcb030a7f2cd7925dd717c3e8 \ No newline at end of file diff --git a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 new file mode 100644 index 0000000000000..929be5cd0d86f --- /dev/null +++ b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 @@ -0,0 +1 @@ +a4a84f37391ab5da0697ba6344555b633aa4bacd \ No newline at end of file diff --git a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.3.0-snapshot-2d05f5c623e.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.3.0-snapshot-2d05f5c623e.jar.sha1 deleted file mode 100644 index 0e5e293c5bba6..0000000000000 --- a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.3.0-snapshot-2d05f5c623e.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e15673b088608c7b7e2b5ab491665f9ea92941b2 \ No newline at end of file diff --git a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 new file mode 100644 index 0000000000000..60c85b324c183 --- /dev/null +++ b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 @@ -0,0 +1 @@ +012f177949d83aa7bdf26c309f5569f67d1c65b5 \ No newline at end of file diff --git a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.3.0-snapshot-2d05f5c623e.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.3.0-snapshot-2d05f5c623e.jar.sha1 deleted file mode 100644 index f818c60390a7e..0000000000000 --- a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.3.0-snapshot-2d05f5c623e.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f997bf7bdd07a5684e017294764b0a2ca398f948 \ No newline at end of file diff --git a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 new file mode 100644 index 0000000000000..782b48c8fd4df --- /dev/null +++ b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 @@ -0,0 +1 @@ +792f50d6cd8b75c277c514f2f6e9914572942dfe \ No newline at end of file diff --git a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.3.0-snapshot-2d05f5c623e.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.3.0-snapshot-2d05f5c623e.jar.sha1 deleted file mode 100644 index 6153f690cb542..0000000000000 --- a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.3.0-snapshot-2d05f5c623e.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7cdabbc7114cb7f2925407dd7e18fe6e36fbfc02 \ No newline at end of file diff --git a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 new file mode 100644 index 0000000000000..4b9ceb4a4581f --- /dev/null +++ b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 @@ -0,0 +1 @@ +b1488267195c87749dcc42de6b2f665d24ff8d9e \ No newline at end of file diff --git a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.3.0-snapshot-2d05f5c623e.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.3.0-snapshot-2d05f5c623e.jar.sha1 deleted file mode 100644 index 0e796b94b617a..0000000000000 --- a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.3.0-snapshot-2d05f5c623e.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -56cd7a7ae2f9db55fc4150f60745f900a1018e35 \ No newline at end of file diff --git a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 new file mode 100644 index 0000000000000..45ccdbf538570 --- /dev/null +++ b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 @@ -0,0 +1 @@ +c78968b087eaf2a95ed3b67540efc32455bab84d \ No newline at end of file diff --git a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.3.0-snapshot-2d05f5c623e.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.3.0-snapshot-2d05f5c623e.jar.sha1 deleted file mode 100644 index 751392734f742..0000000000000 --- a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.3.0-snapshot-2d05f5c623e.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d8a80d858ca656735e3f3e0e3803f9130a504f58 \ No newline at end of file diff --git a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 new file mode 100644 index 0000000000000..91d9d4c9452b2 --- /dev/null +++ b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 @@ -0,0 +1 @@ +978ee14dad7edab6384d04655ce1db219547b6d8 \ No newline at end of file diff --git a/server/licenses/lucene-analysis-common-9.3.0-snapshot-2d05f5c623e.jar.sha1 b/server/licenses/lucene-analysis-common-9.3.0-snapshot-2d05f5c623e.jar.sha1 deleted file mode 100644 index b7d65fa66ed37..0000000000000 --- a/server/licenses/lucene-analysis-common-9.3.0-snapshot-2d05f5c623e.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ef6b338e156eacb5ae63daa9638899b4b0c44c15 \ No newline at end of file diff --git a/server/licenses/lucene-analysis-common-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 b/server/licenses/lucene-analysis-common-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 new file mode 100644 index 0000000000000..6782780d6cbd4 --- /dev/null +++ b/server/licenses/lucene-analysis-common-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 @@ -0,0 +1 @@ +7a154a194ea505d27b538270ee2db2b5a4a38371 \ No newline at end of file diff --git a/server/licenses/lucene-backward-codecs-9.3.0-snapshot-2d05f5c623e.jar.sha1 b/server/licenses/lucene-backward-codecs-9.3.0-snapshot-2d05f5c623e.jar.sha1 deleted file mode 100644 index 1c06267cd06de..0000000000000 --- a/server/licenses/lucene-backward-codecs-9.3.0-snapshot-2d05f5c623e.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -25886039976045fb8f9859e12f525eedbb64860a \ No newline at end of file diff --git a/server/licenses/lucene-backward-codecs-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 b/server/licenses/lucene-backward-codecs-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 new file mode 100644 index 0000000000000..220d2b83dacd9 --- /dev/null +++ b/server/licenses/lucene-backward-codecs-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 @@ -0,0 +1 @@ +3ad36d2a32c1dda37040cdfed9dcdf294b8f3b7c \ No newline at end of file diff --git a/server/licenses/lucene-core-9.3.0-snapshot-2d05f5c623e.jar.sha1 b/server/licenses/lucene-core-9.3.0-snapshot-2d05f5c623e.jar.sha1 deleted file mode 100644 index f524e2a76baff..0000000000000 --- a/server/licenses/lucene-core-9.3.0-snapshot-2d05f5c623e.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -98b0f69f9d285dcf822bcd90974e8aa4972187b9 \ No newline at end of file diff --git a/server/licenses/lucene-core-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 b/server/licenses/lucene-core-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 new file mode 100644 index 0000000000000..1acc580cf4a7e --- /dev/null +++ b/server/licenses/lucene-core-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 @@ -0,0 +1 @@ +e41aa9fe38033e61da13fe420aa6e9400f467dd8 \ No newline at end of file diff --git a/server/licenses/lucene-grouping-9.3.0-snapshot-2d05f5c623e.jar.sha1 b/server/licenses/lucene-grouping-9.3.0-snapshot-2d05f5c623e.jar.sha1 deleted file mode 100644 index 9cdedb97f47da..0000000000000 --- a/server/licenses/lucene-grouping-9.3.0-snapshot-2d05f5c623e.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6f6126445ac9b86ef93c6ab26907a69931ada790 \ No newline at end of file diff --git a/server/licenses/lucene-grouping-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 b/server/licenses/lucene-grouping-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 new file mode 100644 index 0000000000000..25f07a5af5a69 --- /dev/null +++ b/server/licenses/lucene-grouping-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 @@ -0,0 +1 @@ +71cd063e306af5acf1cef0492eebbbf000e6a6ce \ No newline at end of file diff --git a/server/licenses/lucene-highlighter-9.3.0-snapshot-2d05f5c623e.jar.sha1 b/server/licenses/lucene-highlighter-9.3.0-snapshot-2d05f5c623e.jar.sha1 deleted file mode 100644 index 3f84d24e52870..0000000000000 --- a/server/licenses/lucene-highlighter-9.3.0-snapshot-2d05f5c623e.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -dd6fafd8701b01a3f6279447f7d7c410b1230c13 \ No newline at end of file diff --git a/server/licenses/lucene-highlighter-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 b/server/licenses/lucene-highlighter-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 new file mode 100644 index 0000000000000..263f6dd6b208e --- /dev/null +++ b/server/licenses/lucene-highlighter-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 @@ -0,0 +1 @@ +adc913180fac1b221f57288661f069cb7a240127 \ No newline at end of file diff --git a/server/licenses/lucene-join-9.3.0-snapshot-2d05f5c623e.jar.sha1 b/server/licenses/lucene-join-9.3.0-snapshot-2d05f5c623e.jar.sha1 deleted file mode 100644 index 970cfe6d7f5be..0000000000000 --- a/server/licenses/lucene-join-9.3.0-snapshot-2d05f5c623e.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2bc4615335ba485b2152cd10d21ca0cb768b651e \ No newline at end of file diff --git a/server/licenses/lucene-join-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 b/server/licenses/lucene-join-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 new file mode 100644 index 0000000000000..638bf0f37a91f --- /dev/null +++ b/server/licenses/lucene-join-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 @@ -0,0 +1 @@ +3618de63e62d734ab1892ff446ae4f5ef866bee6 \ No newline at end of file diff --git a/server/licenses/lucene-memory-9.3.0-snapshot-2d05f5c623e.jar.sha1 b/server/licenses/lucene-memory-9.3.0-snapshot-2d05f5c623e.jar.sha1 deleted file mode 100644 index e02a9fb3c97c8..0000000000000 --- a/server/licenses/lucene-memory-9.3.0-snapshot-2d05f5c623e.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -3972925a8a1e304e803491881e67c12cbcda4617 \ No newline at end of file diff --git a/server/licenses/lucene-memory-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 b/server/licenses/lucene-memory-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 new file mode 100644 index 0000000000000..3ca4420b49396 --- /dev/null +++ b/server/licenses/lucene-memory-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 @@ -0,0 +1 @@ +07e0de548fc392428545db40192280b4f83daf4f \ No newline at end of file diff --git a/server/licenses/lucene-misc-9.3.0-snapshot-2d05f5c623e.jar.sha1 b/server/licenses/lucene-misc-9.3.0-snapshot-2d05f5c623e.jar.sha1 deleted file mode 100644 index 212df59af0045..0000000000000 --- a/server/licenses/lucene-misc-9.3.0-snapshot-2d05f5c623e.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -18c2adc5e45d08d65e64d31402219b67d7bc5c61 \ No newline at end of file diff --git a/server/licenses/lucene-misc-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 b/server/licenses/lucene-misc-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 new file mode 100644 index 0000000000000..09ecd52494738 --- /dev/null +++ b/server/licenses/lucene-misc-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 @@ -0,0 +1 @@ +ab308291a7dd5ec9988a229dc8e7c27fc2bb5409 \ No newline at end of file diff --git a/server/licenses/lucene-queries-9.3.0-snapshot-2d05f5c623e.jar.sha1 b/server/licenses/lucene-queries-9.3.0-snapshot-2d05f5c623e.jar.sha1 deleted file mode 100644 index 7b42f54005970..0000000000000 --- a/server/licenses/lucene-queries-9.3.0-snapshot-2d05f5c623e.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -bc9e4af7d35799ba941993be0242101f79719cc6 \ No newline at end of file diff --git a/server/licenses/lucene-queries-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 b/server/licenses/lucene-queries-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 new file mode 100644 index 0000000000000..8d2959d64aac3 --- /dev/null +++ b/server/licenses/lucene-queries-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 @@ -0,0 +1 @@ +8b5804be2c87d995c5255ff1ad739052fc243661 \ No newline at end of file diff --git a/server/licenses/lucene-queryparser-9.3.0-snapshot-2d05f5c623e.jar.sha1 b/server/licenses/lucene-queryparser-9.3.0-snapshot-2d05f5c623e.jar.sha1 deleted file mode 100644 index 9521e69459042..0000000000000 --- a/server/licenses/lucene-queryparser-9.3.0-snapshot-2d05f5c623e.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f62b8f566e37fd6cf150f13d866fcc646c210e35 \ No newline at end of file diff --git a/server/licenses/lucene-queryparser-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 b/server/licenses/lucene-queryparser-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 new file mode 100644 index 0000000000000..0be8f71b787a2 --- /dev/null +++ b/server/licenses/lucene-queryparser-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 @@ -0,0 +1 @@ +a55d8a68cccaaf4af5a973c4332519d3eb477068 \ No newline at end of file diff --git a/server/licenses/lucene-sandbox-9.3.0-snapshot-2d05f5c623e.jar.sha1 b/server/licenses/lucene-sandbox-9.3.0-snapshot-2d05f5c623e.jar.sha1 deleted file mode 100644 index 82549c3474cd4..0000000000000 --- a/server/licenses/lucene-sandbox-9.3.0-snapshot-2d05f5c623e.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -081ff7330c13bfcf0110e7140badfc8be3df910c \ No newline at end of file diff --git a/server/licenses/lucene-sandbox-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 b/server/licenses/lucene-sandbox-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 new file mode 100644 index 0000000000000..da0e369ccba29 --- /dev/null +++ b/server/licenses/lucene-sandbox-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 @@ -0,0 +1 @@ +0a6005b6b9b09b1da1c3c74558693824f429e55d \ No newline at end of file diff --git a/server/licenses/lucene-suggest-9.3.0-snapshot-2d05f5c623e.jar.sha1 b/server/licenses/lucene-suggest-9.3.0-snapshot-2d05f5c623e.jar.sha1 deleted file mode 100644 index 133379a6f6abd..0000000000000 --- a/server/licenses/lucene-suggest-9.3.0-snapshot-2d05f5c623e.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e3240b6ab35e61a947d94978697816d102b1bd13 \ No newline at end of file diff --git a/server/licenses/lucene-suggest-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 b/server/licenses/lucene-suggest-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 new file mode 100644 index 0000000000000..38a6a7ca5e787 --- /dev/null +++ b/server/licenses/lucene-suggest-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 @@ -0,0 +1 @@ +d4c5418c469be74cc5df3427ac07386598c18882 \ No newline at end of file diff --git a/server/src/main/java/org/elasticsearch/common/lucene/Lucene.java b/server/src/main/java/org/elasticsearch/common/lucene/Lucene.java index 1adf0d6afd0ee..d5c2f8e7d5d63 100644 --- a/server/src/main/java/org/elasticsearch/common/lucene/Lucene.java +++ b/server/src/main/java/org/elasticsearch/common/lucene/Lucene.java @@ -86,7 +86,7 @@ import java.util.Map; public class Lucene { - public static final String LATEST_CODEC = "Lucene93"; + public static final String LATEST_CODEC = "Lucene92"; public static final String SOFT_DELETES_FIELD = "__soft_deletes"; diff --git a/server/src/main/java/org/elasticsearch/index/codec/CodecService.java b/server/src/main/java/org/elasticsearch/index/codec/CodecService.java index f797c39a4ef29..bd9dfeca6d694 100644 --- a/server/src/main/java/org/elasticsearch/index/codec/CodecService.java +++ b/server/src/main/java/org/elasticsearch/index/codec/CodecService.java @@ -9,7 +9,7 @@ package org.elasticsearch.index.codec; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.codecs.lucene93.Lucene93Codec; +import org.apache.lucene.codecs.lucene92.Lucene92Codec; import org.elasticsearch.core.Nullable; import org.elasticsearch.index.mapper.MapperService; @@ -34,11 +34,11 @@ public class CodecService { public CodecService(@Nullable MapperService mapperService) { final var codecs = new HashMap(); if (mapperService == null) { - codecs.put(DEFAULT_CODEC, new Lucene93Codec()); - codecs.put(BEST_COMPRESSION_CODEC, new Lucene93Codec(Lucene93Codec.Mode.BEST_COMPRESSION)); + codecs.put(DEFAULT_CODEC, new Lucene92Codec()); + codecs.put(BEST_COMPRESSION_CODEC, new Lucene92Codec(Lucene92Codec.Mode.BEST_COMPRESSION)); } else { - codecs.put(DEFAULT_CODEC, new PerFieldMapperCodec(Lucene93Codec.Mode.BEST_SPEED, mapperService)); - codecs.put(BEST_COMPRESSION_CODEC, new PerFieldMapperCodec(Lucene93Codec.Mode.BEST_COMPRESSION, mapperService)); + codecs.put(DEFAULT_CODEC, new PerFieldMapperCodec(Lucene92Codec.Mode.BEST_SPEED, mapperService)); + codecs.put(BEST_COMPRESSION_CODEC, new PerFieldMapperCodec(Lucene92Codec.Mode.BEST_COMPRESSION, mapperService)); } codecs.put(LUCENE_DEFAULT_CODEC, Codec.getDefault()); for (String codec : Codec.availableCodecs()) { diff --git a/server/src/main/java/org/elasticsearch/index/codec/PerFieldMapperCodec.java b/server/src/main/java/org/elasticsearch/index/codec/PerFieldMapperCodec.java index 9c2ffa77d51b2..517280dce73a2 100644 --- a/server/src/main/java/org/elasticsearch/index/codec/PerFieldMapperCodec.java +++ b/server/src/main/java/org/elasticsearch/index/codec/PerFieldMapperCodec.java @@ -13,7 +13,7 @@ import org.apache.lucene.codecs.KnnVectorsFormat; import org.apache.lucene.codecs.PostingsFormat; import org.apache.lucene.codecs.lucene90.Lucene90DocValuesFormat; -import org.apache.lucene.codecs.lucene93.Lucene93Codec; +import org.apache.lucene.codecs.lucene92.Lucene92Codec; import org.elasticsearch.common.lucene.Lucene; import org.elasticsearch.index.mapper.Mapper; import org.elasticsearch.index.mapper.MapperService; @@ -27,7 +27,7 @@ * per index in real time via the mapping API. If no specific postings format or vector format is * configured for a specific field the default postings or vector format is used. */ -public class PerFieldMapperCodec extends Lucene93Codec { +public class PerFieldMapperCodec extends Lucene92Codec { private final MapperService mapperService; private final DocValuesFormat docValuesFormat = new Lucene90DocValuesFormat(); diff --git a/server/src/main/java/org/elasticsearch/index/mapper/vectors/DenseVectorFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/vectors/DenseVectorFieldMapper.java index b66ae08386c68..13a85ac586b0b 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/vectors/DenseVectorFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/vectors/DenseVectorFieldMapper.java @@ -9,7 +9,7 @@ package org.elasticsearch.index.mapper.vectors; import org.apache.lucene.codecs.KnnVectorsFormat; -import org.apache.lucene.codecs.lucene93.Lucene93HnswVectorsFormat; +import org.apache.lucene.codecs.lucene92.Lucene92HnswVectorsFormat; import org.apache.lucene.document.BinaryDocValuesField; import org.apache.lucene.document.Field; import org.apache.lucene.document.KnnVectorField; @@ -523,7 +523,7 @@ public KnnVectorsFormat getKnnVectorsFormatForField() { return null; // use default format } else { HnswIndexOptions hnswIndexOptions = (HnswIndexOptions) indexOptions; - return new Lucene93HnswVectorsFormat(hnswIndexOptions.m, hnswIndexOptions.efConstruction); + return new Lucene92HnswVectorsFormat(hnswIndexOptions.m, hnswIndexOptions.efConstruction); } } } diff --git a/server/src/test/java/org/elasticsearch/action/admin/indices/diskusage/IndexDiskUsageAnalyzerTests.java b/server/src/test/java/org/elasticsearch/action/admin/indices/diskusage/IndexDiskUsageAnalyzerTests.java index 57f51457aa403..84022bc234436 100644 --- a/server/src/test/java/org/elasticsearch/action/admin/indices/diskusage/IndexDiskUsageAnalyzerTests.java +++ b/server/src/test/java/org/elasticsearch/action/admin/indices/diskusage/IndexDiskUsageAnalyzerTests.java @@ -12,7 +12,7 @@ import org.apache.lucene.codecs.PostingsFormat; import org.apache.lucene.codecs.lucene90.Lucene90DocValuesFormat; import org.apache.lucene.codecs.lucene90.Lucene90PostingsFormat; -import org.apache.lucene.codecs.lucene93.Lucene93Codec; +import org.apache.lucene.codecs.lucene92.Lucene92Codec; import org.apache.lucene.codecs.perfield.PerFieldDocValuesFormat; import org.apache.lucene.codecs.perfield.PerFieldPostingsFormat; import org.apache.lucene.document.BinaryDocValuesField; @@ -297,7 +297,7 @@ public void testTriangle() throws Exception { public void testCompletionField() throws Exception { IndexWriterConfig config = new IndexWriterConfig().setCommitOnClose(true) .setUseCompoundFile(false) - .setCodec(new Lucene93Codec(Lucene93Codec.Mode.BEST_SPEED) { + .setCodec(new Lucene92Codec(Lucene92Codec.Mode.BEST_SPEED) { @Override public PostingsFormat getPostingsFormatForField(String field) { if (field.startsWith("suggest_")) { @@ -384,25 +384,25 @@ private static void addFieldsToDoc(Document doc, IndexableField[] fields) { enum CodecMode { BEST_SPEED { @Override - Lucene93Codec.Mode mode() { - return Lucene93Codec.Mode.BEST_SPEED; + Lucene92Codec.Mode mode() { + return Lucene92Codec.Mode.BEST_SPEED; } }, BEST_COMPRESSION { @Override - Lucene93Codec.Mode mode() { - return Lucene93Codec.Mode.BEST_COMPRESSION; + Lucene92Codec.Mode mode() { + return Lucene92Codec.Mode.BEST_COMPRESSION; } }; - abstract Lucene93Codec.Mode mode(); + abstract Lucene92Codec.Mode mode(); } static void indexRandomly(Directory directory, CodecMode codecMode, int numDocs, Consumer addFields) throws IOException { IndexWriterConfig config = new IndexWriterConfig().setCommitOnClose(true) .setUseCompoundFile(randomBoolean()) - .setCodec(new Lucene93Codec(codecMode.mode())); + .setCodec(new Lucene92Codec(codecMode.mode())); try (IndexWriter writer = new IndexWriter(directory, config)) { for (int i = 0; i < numDocs; i++) { final Document doc = new Document(); @@ -580,7 +580,7 @@ static void rewriteIndexWithPerFieldCodec(Directory source, CodecMode mode, Dire try (DirectoryReader reader = DirectoryReader.open(source)) { IndexWriterConfig config = new IndexWriterConfig().setSoftDeletesField(Lucene.SOFT_DELETES_FIELD) .setUseCompoundFile(randomBoolean()) - .setCodec(new Lucene93Codec(mode.mode()) { + .setCodec(new Lucene92Codec(mode.mode()) { @Override public PostingsFormat getPostingsFormatForField(String field) { return new Lucene90PostingsFormat(); diff --git a/server/src/test/java/org/elasticsearch/index/codec/CodecTests.java b/server/src/test/java/org/elasticsearch/index/codec/CodecTests.java index 2a9f8dccf73d6..1b7e80c869496 100644 --- a/server/src/test/java/org/elasticsearch/index/codec/CodecTests.java +++ b/server/src/test/java/org/elasticsearch/index/codec/CodecTests.java @@ -10,7 +10,7 @@ import org.apache.lucene.codecs.Codec; import org.apache.lucene.codecs.lucene90.Lucene90StoredFieldsFormat; -import org.apache.lucene.codecs.lucene93.Lucene93Codec; +import org.apache.lucene.codecs.lucene92.Lucene92Codec; import org.apache.lucene.document.Document; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexWriter; @@ -41,21 +41,21 @@ public class CodecTests extends ESTestCase { public void testResolveDefaultCodecs() throws Exception { CodecService codecService = createCodecService(); assertThat(codecService.codec("default"), instanceOf(PerFieldMapperCodec.class)); - assertThat(codecService.codec("default"), instanceOf(Lucene93Codec.class)); + assertThat(codecService.codec("default"), instanceOf(Lucene92Codec.class)); } public void testDefault() throws Exception { Codec codec = createCodecService().codec("default"); - assertStoredFieldsCompressionEquals(Lucene93Codec.Mode.BEST_SPEED, codec); + assertStoredFieldsCompressionEquals(Lucene92Codec.Mode.BEST_SPEED, codec); } public void testBestCompression() throws Exception { Codec codec = createCodecService().codec("best_compression"); - assertStoredFieldsCompressionEquals(Lucene93Codec.Mode.BEST_COMPRESSION, codec); + assertStoredFieldsCompressionEquals(Lucene92Codec.Mode.BEST_COMPRESSION, codec); } // write some docs with it, inspect .si to see this was the used compression - private void assertStoredFieldsCompressionEquals(Lucene93Codec.Mode expected, Codec actual) throws Exception { + private void assertStoredFieldsCompressionEquals(Lucene92Codec.Mode expected, Codec actual) throws Exception { Directory dir = newDirectory(); IndexWriterConfig iwc = newIndexWriterConfig(null); iwc.setCodec(actual); @@ -67,7 +67,7 @@ private void assertStoredFieldsCompressionEquals(Lucene93Codec.Mode expected, Co SegmentReader sr = (SegmentReader) ir.leaves().get(0).reader(); String v = sr.getSegmentInfo().info.getAttribute(Lucene90StoredFieldsFormat.MODE_KEY); assertNotNull(v); - assertEquals(expected, Lucene93Codec.Mode.valueOf(v)); + assertEquals(expected, Lucene92Codec.Mode.valueOf(v)); ir.close(); dir.close(); } diff --git a/server/src/test/java/org/elasticsearch/index/engine/CompletionStatsCacheTests.java b/server/src/test/java/org/elasticsearch/index/engine/CompletionStatsCacheTests.java index 83bc488ac0641..1e03c7d3571ad 100644 --- a/server/src/test/java/org/elasticsearch/index/engine/CompletionStatsCacheTests.java +++ b/server/src/test/java/org/elasticsearch/index/engine/CompletionStatsCacheTests.java @@ -8,7 +8,7 @@ package org.elasticsearch.index.engine; import org.apache.lucene.codecs.PostingsFormat; -import org.apache.lucene.codecs.lucene93.Lucene93Codec; +import org.apache.lucene.codecs.lucene92.Lucene92Codec; import org.apache.lucene.document.Document; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexWriter; @@ -45,7 +45,7 @@ public void testExceptionsAreNotCached() { public void testCompletionStatsCache() throws IOException, InterruptedException { final IndexWriterConfig indexWriterConfig = newIndexWriterConfig(); final PostingsFormat postingsFormat = new Completion90PostingsFormat(); - indexWriterConfig.setCodec(new Lucene93Codec() { + indexWriterConfig.setCodec(new Lucene92Codec() { @Override public PostingsFormat getPostingsFormatForField(String field) { return postingsFormat; // all fields are suggest fields diff --git a/server/src/test/java/org/elasticsearch/index/mapper/vectors/DenseVectorFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/vectors/DenseVectorFieldMapperTests.java index 069474cca314c..4fa3071890070 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/vectors/DenseVectorFieldMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/vectors/DenseVectorFieldMapperTests.java @@ -12,7 +12,7 @@ import org.apache.lucene.codecs.Codec; import org.apache.lucene.codecs.KnnVectorsFormat; -import org.apache.lucene.codecs.lucene93.Lucene93HnswVectorsFormat; +import org.apache.lucene.codecs.lucene92.Lucene92HnswVectorsFormat; import org.apache.lucene.document.BinaryDocValuesField; import org.apache.lucene.document.KnnVectorField; import org.apache.lucene.index.IndexableField; @@ -39,8 +39,8 @@ import java.util.Arrays; import java.util.List; -import static org.apache.lucene.codecs.lucene93.Lucene93HnswVectorsFormat.DEFAULT_BEAM_WIDTH; -import static org.apache.lucene.codecs.lucene93.Lucene93HnswVectorsFormat.DEFAULT_MAX_CONN; +import static org.apache.lucene.codecs.lucene92.Lucene92HnswVectorsFormat.DEFAULT_BEAM_WIDTH; +import static org.apache.lucene.codecs.lucene92.Lucene92HnswVectorsFormat.DEFAULT_MAX_CONN; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.instanceOf; @@ -454,8 +454,8 @@ public void testKnnVectorsFormat() throws IOException { Codec codec = codecService.codec("default"); assertThat(codec, instanceOf(PerFieldMapperCodec.class)); KnnVectorsFormat knnVectorsFormat = ((PerFieldMapperCodec) codec).getKnnVectorsFormatForField("field"); - assertThat(knnVectorsFormat, instanceOf(Lucene93HnswVectorsFormat.class)); - String expectedString = "Lucene93HnswVectorsFormat(name=Lucene93HnswVectorsFormat, maxConn=" + assertThat(knnVectorsFormat, instanceOf(Lucene92HnswVectorsFormat.class)); + String expectedString = "lucene92HnswVectorsFormat(name = lucene92HnswVectorsFormat, maxConn = " + m + ", beamWidth=" + efConstruction diff --git a/x-pack/plugin/ml/licenses/lucene-analysis-icu-9.3.0-snapshot-2d05f5c623e.jar.sha1 b/x-pack/plugin/ml/licenses/lucene-analysis-icu-9.3.0-snapshot-2d05f5c623e.jar.sha1 deleted file mode 100644 index 73d5dfdcae436..0000000000000 --- a/x-pack/plugin/ml/licenses/lucene-analysis-icu-9.3.0-snapshot-2d05f5c623e.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -87772b1d9907c63287d7bc79cf8fa3e9a46c9c77 \ No newline at end of file diff --git a/x-pack/plugin/ml/licenses/lucene-analysis-icu-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 b/x-pack/plugin/ml/licenses/lucene-analysis-icu-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 new file mode 100644 index 0000000000000..ceea8ba4f6855 --- /dev/null +++ b/x-pack/plugin/ml/licenses/lucene-analysis-icu-9.3.0-snapshot-b8d1fcfd0ec.jar.sha1 @@ -0,0 +1 @@ +501aa4f0028424a994b06627f30ffb36150ffbe2 \ No newline at end of file