diff --git a/buildSrc/version.properties b/buildSrc/version.properties index 14911433e28..b6085d77ea9 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -1,5 +1,5 @@ elasticsearch = 7.0.0-alpha1 -lucene = 7.4.0-snapshot-bcf9f5c36b +lucene = 7.4.0-snapshot-aeac55a602 # optional dependencies spatial4j = 0.7 diff --git a/modules/lang-expression/licenses/lucene-expressions-7.4.0-snapshot-aeac55a602.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-7.4.0-snapshot-aeac55a602.jar.sha1 new file mode 100644 index 00000000000..d8409fdadfc --- /dev/null +++ b/modules/lang-expression/licenses/lucene-expressions-7.4.0-snapshot-aeac55a602.jar.sha1 @@ -0,0 +1 @@ +c6141778b6773dfa8133402fb87251a48b522f71 \ No newline at end of file diff --git a/modules/lang-expression/licenses/lucene-expressions-7.4.0-snapshot-bcf9f5c36b.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-7.4.0-snapshot-bcf9f5c36b.jar.sha1 deleted file mode 100644 index 7429ed69f86..00000000000 --- a/modules/lang-expression/licenses/lucene-expressions-7.4.0-snapshot-bcf9f5c36b.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c78657977dd5ca44defbdd77155b87e199d607b7 \ No newline at end of file diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.4.0-snapshot-aeac55a602.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.4.0-snapshot-aeac55a602.jar.sha1 new file mode 100644 index 00000000000..4ba1852145b --- /dev/null +++ b/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.4.0-snapshot-aeac55a602.jar.sha1 @@ -0,0 +1 @@ +3c33ef8a4088f408f0786dd64e111673b0577eff \ No newline at end of file diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.4.0-snapshot-bcf9f5c36b.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.4.0-snapshot-bcf9f5c36b.jar.sha1 deleted file mode 100644 index 954b4c4238f..00000000000 --- a/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.4.0-snapshot-bcf9f5c36b.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -946cfdd6f93e542094fde179c854f915097a24ee \ No newline at end of file diff --git a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.4.0-snapshot-aeac55a602.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.4.0-snapshot-aeac55a602.jar.sha1 new file mode 100644 index 00000000000..663af130c0c --- /dev/null +++ b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.4.0-snapshot-aeac55a602.jar.sha1 @@ -0,0 +1 @@ +2056051c024d9f8580db94a629f2c97245852003 \ No newline at end of file diff --git a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.4.0-snapshot-bcf9f5c36b.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.4.0-snapshot-bcf9f5c36b.jar.sha1 deleted file mode 100644 index 4162ecb2c89..00000000000 --- a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.4.0-snapshot-bcf9f5c36b.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -3be7d940a7f9f0b090b07d40095bf1dfbce4c0b4 \ No newline at end of file diff --git a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.4.0-snapshot-aeac55a602.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.4.0-snapshot-aeac55a602.jar.sha1 new file mode 100644 index 00000000000..940b0dae2d6 --- /dev/null +++ b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.4.0-snapshot-aeac55a602.jar.sha1 @@ -0,0 +1 @@ +12d051a6521ad4eeb78eec11db66cf1c25995292 \ No newline at end of file diff --git a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.4.0-snapshot-bcf9f5c36b.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.4.0-snapshot-bcf9f5c36b.jar.sha1 deleted file mode 100644 index fcee6e6c026..00000000000 --- a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.4.0-snapshot-bcf9f5c36b.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -aa1d1419a71c51af0fe07c85565f931655b50d2d \ No newline at end of file diff --git a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.4.0-snapshot-aeac55a602.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.4.0-snapshot-aeac55a602.jar.sha1 new file mode 100644 index 00000000000..97143275825 --- /dev/null +++ b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.4.0-snapshot-aeac55a602.jar.sha1 @@ -0,0 +1 @@ +ad4bcf0a27bc9f7b31e0d504528a3f062723c42f \ No newline at end of file diff --git a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.4.0-snapshot-bcf9f5c36b.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.4.0-snapshot-bcf9f5c36b.jar.sha1 deleted file mode 100644 index 7522e3a34a6..00000000000 --- a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.4.0-snapshot-bcf9f5c36b.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -0b4caf6f9b43e840476fbfad88bce4b8f69bfaba \ No newline at end of file diff --git a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.4.0-snapshot-aeac55a602.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.4.0-snapshot-aeac55a602.jar.sha1 new file mode 100644 index 00000000000..97a1d724e27 --- /dev/null +++ b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.4.0-snapshot-aeac55a602.jar.sha1 @@ -0,0 +1 @@ +2ff367c7b730e20f64baa4dd42d0cbd8d4964b4a \ No newline at end of file diff --git a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.4.0-snapshot-bcf9f5c36b.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.4.0-snapshot-bcf9f5c36b.jar.sha1 deleted file mode 100644 index 09761b8c626..00000000000 --- a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.4.0-snapshot-bcf9f5c36b.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c7fdd43a503867129eeb72f632ccd8d0d5c1a114 \ No newline at end of file diff --git a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.4.0-snapshot-aeac55a602.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.4.0-snapshot-aeac55a602.jar.sha1 new file mode 100644 index 00000000000..871346da0fc --- /dev/null +++ b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.4.0-snapshot-aeac55a602.jar.sha1 @@ -0,0 +1 @@ +d47bef70d558cc29fcb627ded2aa1e4d11f172f0 \ No newline at end of file diff --git a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.4.0-snapshot-bcf9f5c36b.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.4.0-snapshot-bcf9f5c36b.jar.sha1 deleted file mode 100644 index 192ba09f22a..00000000000 --- a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.4.0-snapshot-bcf9f5c36b.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f24074b0c84d8928a59d8ffc0e35b5a0d7118e5a \ No newline at end of file diff --git a/server/licenses/lucene-analyzers-common-7.4.0-snapshot-aeac55a602.jar.sha1 b/server/licenses/lucene-analyzers-common-7.4.0-snapshot-aeac55a602.jar.sha1 new file mode 100644 index 00000000000..6ca0318e6a6 --- /dev/null +++ b/server/licenses/lucene-analyzers-common-7.4.0-snapshot-aeac55a602.jar.sha1 @@ -0,0 +1 @@ +cd2c30150b5b274dc0eb184b9b343b645ac16914 \ No newline at end of file diff --git a/server/licenses/lucene-analyzers-common-7.4.0-snapshot-bcf9f5c36b.jar.sha1 b/server/licenses/lucene-analyzers-common-7.4.0-snapshot-bcf9f5c36b.jar.sha1 deleted file mode 100644 index c66dfe7f8d7..00000000000 --- a/server/licenses/lucene-analyzers-common-7.4.0-snapshot-bcf9f5c36b.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -35fe318de8e259af242e54af019c7120476744d8 \ No newline at end of file diff --git a/server/licenses/lucene-backward-codecs-7.4.0-snapshot-aeac55a602.jar.sha1 b/server/licenses/lucene-backward-codecs-7.4.0-snapshot-aeac55a602.jar.sha1 new file mode 100644 index 00000000000..5aaca3b2309 --- /dev/null +++ b/server/licenses/lucene-backward-codecs-7.4.0-snapshot-aeac55a602.jar.sha1 @@ -0,0 +1 @@ +2cb12a0173dcc98a03f97200293606c8a0064162 \ No newline at end of file diff --git a/server/licenses/lucene-backward-codecs-7.4.0-snapshot-bcf9f5c36b.jar.sha1 b/server/licenses/lucene-backward-codecs-7.4.0-snapshot-bcf9f5c36b.jar.sha1 deleted file mode 100644 index 7ac38fbc5b8..00000000000 --- a/server/licenses/lucene-backward-codecs-7.4.0-snapshot-bcf9f5c36b.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -dc5a2b6af11a2e20632f5f47c4266ed9666b1aa1 \ No newline at end of file diff --git a/server/licenses/lucene-core-7.4.0-snapshot-aeac55a602.jar.sha1 b/server/licenses/lucene-core-7.4.0-snapshot-aeac55a602.jar.sha1 new file mode 100644 index 00000000000..542c1044c22 --- /dev/null +++ b/server/licenses/lucene-core-7.4.0-snapshot-aeac55a602.jar.sha1 @@ -0,0 +1 @@ +3d8efc98834652e20f3fbbf39164806d5e0c2591 \ No newline at end of file diff --git a/server/licenses/lucene-core-7.4.0-snapshot-bcf9f5c36b.jar.sha1 b/server/licenses/lucene-core-7.4.0-snapshot-bcf9f5c36b.jar.sha1 deleted file mode 100644 index 7081500c7b1..00000000000 --- a/server/licenses/lucene-core-7.4.0-snapshot-bcf9f5c36b.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f291c3d247e46ce1d9fd1a648324864b8232a762 \ No newline at end of file diff --git a/server/licenses/lucene-grouping-7.4.0-snapshot-aeac55a602.jar.sha1 b/server/licenses/lucene-grouping-7.4.0-snapshot-aeac55a602.jar.sha1 new file mode 100644 index 00000000000..12bfbadd4e9 --- /dev/null +++ b/server/licenses/lucene-grouping-7.4.0-snapshot-aeac55a602.jar.sha1 @@ -0,0 +1 @@ +065a98afa830f5cc42f4f51e8de320ff5747e95a \ No newline at end of file diff --git a/server/licenses/lucene-grouping-7.4.0-snapshot-bcf9f5c36b.jar.sha1 b/server/licenses/lucene-grouping-7.4.0-snapshot-bcf9f5c36b.jar.sha1 deleted file mode 100644 index 67320df7d11..00000000000 --- a/server/licenses/lucene-grouping-7.4.0-snapshot-bcf9f5c36b.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7e0a97b0717d548951e4172769e0adb6dab3a5ce \ No newline at end of file diff --git a/server/licenses/lucene-highlighter-7.4.0-snapshot-aeac55a602.jar.sha1 b/server/licenses/lucene-highlighter-7.4.0-snapshot-aeac55a602.jar.sha1 new file mode 100644 index 00000000000..9872fb4cbf2 --- /dev/null +++ b/server/licenses/lucene-highlighter-7.4.0-snapshot-aeac55a602.jar.sha1 @@ -0,0 +1 @@ +355648eca33f24621061966545270db50c46469c \ No newline at end of file diff --git a/server/licenses/lucene-highlighter-7.4.0-snapshot-bcf9f5c36b.jar.sha1 b/server/licenses/lucene-highlighter-7.4.0-snapshot-bcf9f5c36b.jar.sha1 deleted file mode 100644 index 3cffa44a0b2..00000000000 --- a/server/licenses/lucene-highlighter-7.4.0-snapshot-bcf9f5c36b.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b8ea60b8b694f86a38c27c84ad4dbe18f88ed457 \ No newline at end of file diff --git a/server/licenses/lucene-join-7.4.0-snapshot-aeac55a602.jar.sha1 b/server/licenses/lucene-join-7.4.0-snapshot-aeac55a602.jar.sha1 new file mode 100644 index 00000000000..1456b99e4f3 --- /dev/null +++ b/server/licenses/lucene-join-7.4.0-snapshot-aeac55a602.jar.sha1 @@ -0,0 +1 @@ +91d747bcaa9240f49ebfd706528459c04e72a105 \ No newline at end of file diff --git a/server/licenses/lucene-join-7.4.0-snapshot-bcf9f5c36b.jar.sha1 b/server/licenses/lucene-join-7.4.0-snapshot-bcf9f5c36b.jar.sha1 deleted file mode 100644 index 2f2da00d31a..00000000000 --- a/server/licenses/lucene-join-7.4.0-snapshot-bcf9f5c36b.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -224951a933a3244fff7f48ada466bf46f3a25e6b \ No newline at end of file diff --git a/server/licenses/lucene-memory-7.4.0-snapshot-aeac55a602.jar.sha1 b/server/licenses/lucene-memory-7.4.0-snapshot-aeac55a602.jar.sha1 new file mode 100644 index 00000000000..43a37736fd0 --- /dev/null +++ b/server/licenses/lucene-memory-7.4.0-snapshot-aeac55a602.jar.sha1 @@ -0,0 +1 @@ +d2b4a65550206e7bc3e47f8c15e1d64a8c555d02 \ No newline at end of file diff --git a/server/licenses/lucene-memory-7.4.0-snapshot-bcf9f5c36b.jar.sha1 b/server/licenses/lucene-memory-7.4.0-snapshot-bcf9f5c36b.jar.sha1 deleted file mode 100644 index 2a71802b1a7..00000000000 --- a/server/licenses/lucene-memory-7.4.0-snapshot-bcf9f5c36b.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -24e0864db54970237a08c8b59a9769be70c8c252 \ No newline at end of file diff --git a/server/licenses/lucene-misc-7.4.0-snapshot-aeac55a602.jar.sha1 b/server/licenses/lucene-misc-7.4.0-snapshot-aeac55a602.jar.sha1 new file mode 100644 index 00000000000..796d0e9a2c7 --- /dev/null +++ b/server/licenses/lucene-misc-7.4.0-snapshot-aeac55a602.jar.sha1 @@ -0,0 +1 @@ +27f6af2833dc9dd6435db9ee161a640360937e9b \ No newline at end of file diff --git a/server/licenses/lucene-misc-7.4.0-snapshot-bcf9f5c36b.jar.sha1 b/server/licenses/lucene-misc-7.4.0-snapshot-bcf9f5c36b.jar.sha1 deleted file mode 100644 index fdb889943f0..00000000000 --- a/server/licenses/lucene-misc-7.4.0-snapshot-bcf9f5c36b.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9375c0976ace985402fe1360b9ffa15bef09f1d1 \ No newline at end of file diff --git a/server/licenses/lucene-queries-7.4.0-snapshot-aeac55a602.jar.sha1 b/server/licenses/lucene-queries-7.4.0-snapshot-aeac55a602.jar.sha1 new file mode 100644 index 00000000000..d5c4f10ed9a --- /dev/null +++ b/server/licenses/lucene-queries-7.4.0-snapshot-aeac55a602.jar.sha1 @@ -0,0 +1 @@ +7639cca89b03b53e7a4d075563cab770e6367d3f \ No newline at end of file diff --git a/server/licenses/lucene-queries-7.4.0-snapshot-bcf9f5c36b.jar.sha1 b/server/licenses/lucene-queries-7.4.0-snapshot-bcf9f5c36b.jar.sha1 deleted file mode 100644 index 80a759ed162..00000000000 --- a/server/licenses/lucene-queries-7.4.0-snapshot-bcf9f5c36b.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -eb493f05ee5d1fdbddf3d43db9a51fa0bddf1efd \ No newline at end of file diff --git a/server/licenses/lucene-queryparser-7.4.0-snapshot-aeac55a602.jar.sha1 b/server/licenses/lucene-queryparser-7.4.0-snapshot-aeac55a602.jar.sha1 new file mode 100644 index 00000000000..9b10aebdcef --- /dev/null +++ b/server/licenses/lucene-queryparser-7.4.0-snapshot-aeac55a602.jar.sha1 @@ -0,0 +1 @@ +2bc5117eb0e9a9a454762ee19b00fe8ba5dbf639 \ No newline at end of file diff --git a/server/licenses/lucene-queryparser-7.4.0-snapshot-bcf9f5c36b.jar.sha1 b/server/licenses/lucene-queryparser-7.4.0-snapshot-bcf9f5c36b.jar.sha1 deleted file mode 100644 index 299660c79dc..00000000000 --- a/server/licenses/lucene-queryparser-7.4.0-snapshot-bcf9f5c36b.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -abe600a798fdfbd87eb836bf06eb3fae352a71a4 \ No newline at end of file diff --git a/server/licenses/lucene-sandbox-7.4.0-snapshot-aeac55a602.jar.sha1 b/server/licenses/lucene-sandbox-7.4.0-snapshot-aeac55a602.jar.sha1 new file mode 100644 index 00000000000..a2676187c8b --- /dev/null +++ b/server/licenses/lucene-sandbox-7.4.0-snapshot-aeac55a602.jar.sha1 @@ -0,0 +1 @@ +a429d7bb0f0a065d95bcadeb4b9544571bac8c54 \ No newline at end of file diff --git a/server/licenses/lucene-sandbox-7.4.0-snapshot-bcf9f5c36b.jar.sha1 b/server/licenses/lucene-sandbox-7.4.0-snapshot-bcf9f5c36b.jar.sha1 deleted file mode 100644 index 9df1f3879d9..00000000000 --- a/server/licenses/lucene-sandbox-7.4.0-snapshot-bcf9f5c36b.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d476b38846c8c130260fb19c7c65227e4cff32c8 \ No newline at end of file diff --git a/server/licenses/lucene-spatial-7.4.0-snapshot-aeac55a602.jar.sha1 b/server/licenses/lucene-spatial-7.4.0-snapshot-aeac55a602.jar.sha1 new file mode 100644 index 00000000000..ff8ba11373a --- /dev/null +++ b/server/licenses/lucene-spatial-7.4.0-snapshot-aeac55a602.jar.sha1 @@ -0,0 +1 @@ +7480c87858b0914cd1e8b6eca4233bfd992e05fe \ No newline at end of file diff --git a/server/licenses/lucene-spatial-7.4.0-snapshot-bcf9f5c36b.jar.sha1 b/server/licenses/lucene-spatial-7.4.0-snapshot-bcf9f5c36b.jar.sha1 deleted file mode 100644 index 4e88ac7a4c6..00000000000 --- a/server/licenses/lucene-spatial-7.4.0-snapshot-bcf9f5c36b.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -96cd664728c1698b3540c465949f4f9c1bace740 \ No newline at end of file diff --git a/server/licenses/lucene-spatial-extras-7.4.0-snapshot-aeac55a602.jar.sha1 b/server/licenses/lucene-spatial-extras-7.4.0-snapshot-aeac55a602.jar.sha1 new file mode 100644 index 00000000000..1e1424384ff --- /dev/null +++ b/server/licenses/lucene-spatial-extras-7.4.0-snapshot-aeac55a602.jar.sha1 @@ -0,0 +1 @@ +cdedb3903325a4befad094813e96a06d6fb8501f \ No newline at end of file diff --git a/server/licenses/lucene-spatial-extras-7.4.0-snapshot-bcf9f5c36b.jar.sha1 b/server/licenses/lucene-spatial-extras-7.4.0-snapshot-bcf9f5c36b.jar.sha1 deleted file mode 100644 index 75e9d3c7676..00000000000 --- a/server/licenses/lucene-spatial-extras-7.4.0-snapshot-bcf9f5c36b.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8ecbd479b8d4b871d501448b8b446222df0bbdba \ No newline at end of file diff --git a/server/licenses/lucene-spatial3d-7.4.0-snapshot-aeac55a602.jar.sha1 b/server/licenses/lucene-spatial3d-7.4.0-snapshot-aeac55a602.jar.sha1 new file mode 100644 index 00000000000..21c185c264b --- /dev/null +++ b/server/licenses/lucene-spatial3d-7.4.0-snapshot-aeac55a602.jar.sha1 @@ -0,0 +1 @@ +43a2716e10e10fe3e4ee799c3bb30a98ce488156 \ No newline at end of file diff --git a/server/licenses/lucene-spatial3d-7.4.0-snapshot-bcf9f5c36b.jar.sha1 b/server/licenses/lucene-spatial3d-7.4.0-snapshot-bcf9f5c36b.jar.sha1 deleted file mode 100644 index dfa1abddd07..00000000000 --- a/server/licenses/lucene-spatial3d-7.4.0-snapshot-bcf9f5c36b.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c3c93da655f46157a6d76e915d6bda99b1375ca0 \ No newline at end of file diff --git a/server/licenses/lucene-suggest-7.4.0-snapshot-aeac55a602.jar.sha1 b/server/licenses/lucene-suggest-7.4.0-snapshot-aeac55a602.jar.sha1 new file mode 100644 index 00000000000..ecdb5cfd677 --- /dev/null +++ b/server/licenses/lucene-suggest-7.4.0-snapshot-aeac55a602.jar.sha1 @@ -0,0 +1 @@ +8a5906b6b9fc4d13ce563e304baf67fcd2fbc3b6 \ No newline at end of file diff --git a/server/licenses/lucene-suggest-7.4.0-snapshot-bcf9f5c36b.jar.sha1 b/server/licenses/lucene-suggest-7.4.0-snapshot-bcf9f5c36b.jar.sha1 deleted file mode 100644 index dba06d8d59e..00000000000 --- a/server/licenses/lucene-suggest-7.4.0-snapshot-bcf9f5c36b.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8161d63a0b9f41ae394cc1ac8aa954c585169143 \ No newline at end of file diff --git a/server/src/main/java/org/elasticsearch/index/shard/ElasticsearchMergePolicy.java b/server/src/main/java/org/elasticsearch/index/shard/ElasticsearchMergePolicy.java index 9253728fd19..e49ac868aa7 100644 --- a/server/src/main/java/org/elasticsearch/index/shard/ElasticsearchMergePolicy.java +++ b/server/src/main/java/org/elasticsearch/index/shard/ElasticsearchMergePolicy.java @@ -20,9 +20,9 @@ package org.elasticsearch.index.shard; import org.apache.logging.log4j.Logger; +import org.apache.lucene.index.FilterMergePolicy; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.MergePolicy; -import org.apache.lucene.index.MergePolicyWrapper; import org.apache.lucene.index.SegmentCommitInfo; import org.apache.lucene.index.SegmentInfos; import org.elasticsearch.Version; @@ -44,7 +44,7 @@ import java.util.Map; * For now, this {@link MergePolicy} takes care of moving versions that used to * be stored as payloads to numeric doc values. */ -public final class ElasticsearchMergePolicy extends MergePolicyWrapper { +public final class ElasticsearchMergePolicy extends FilterMergePolicy { private static Logger logger = Loggers.getLogger(ElasticsearchMergePolicy.class);