diff --git a/build-tools-internal/version.properties b/build-tools-internal/version.properties index 9ff07b6cd25ce..17223fd39a505 100644 --- a/build-tools-internal/version.properties +++ b/build-tools-internal/version.properties @@ -1,5 +1,5 @@ elasticsearch = 7.17.0 -lucene = 8.10.1 +lucene = 8.11.1 bundled_jdk_vendor = adoptium bundled_jdk = 17.0.1+12 diff --git a/docs/Versions.asciidoc b/docs/Versions.asciidoc index 41a7235255996..46b430b3f8d60 100644 --- a/docs/Versions.asciidoc +++ b/docs/Versions.asciidoc @@ -1,8 +1,8 @@ include::{docs-root}/shared/versions/stack/{source_branch}.asciidoc[] -:lucene_version: 8.10.1 -:lucene_version_path: 8_10_1 +:lucene_version: 8.11.1 +:lucene_version_path: 8_11_1 :jdk: 1.8.0_131 :jdk_major: 8 :build_flavor: default diff --git a/modules/lang-expression/licenses/lucene-expressions-8.10.1.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-8.10.1.jar.sha1 deleted file mode 100644 index f327cbcb6f8e6..0000000000000 --- a/modules/lang-expression/licenses/lucene-expressions-8.10.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -24932a4be7064a99126d80776718845b356abae0 \ No newline at end of file diff --git a/modules/lang-expression/licenses/lucene-expressions-8.11.1.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-8.11.1.jar.sha1 new file mode 100644 index 0000000000000..accd16690e3bc --- /dev/null +++ b/modules/lang-expression/licenses/lucene-expressions-8.11.1.jar.sha1 @@ -0,0 +1 @@ +55d929f0bea58211fcc47085bdd04d04d8f29179 \ No newline at end of file diff --git a/modules/legacy-geo/licenses/lucene-spatial-extras-8.10.1.jar.sha1 b/modules/legacy-geo/licenses/lucene-spatial-extras-8.10.1.jar.sha1 deleted file mode 100644 index 7eb235d9a1914..0000000000000 --- a/modules/legacy-geo/licenses/lucene-spatial-extras-8.10.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7a3b6eac3e66bb1c6fb05c0cd980e5592adaf96b \ No newline at end of file diff --git a/modules/legacy-geo/licenses/lucene-spatial-extras-8.11.1.jar.sha1 b/modules/legacy-geo/licenses/lucene-spatial-extras-8.11.1.jar.sha1 new file mode 100644 index 0000000000000..649a2fe990761 --- /dev/null +++ b/modules/legacy-geo/licenses/lucene-spatial-extras-8.11.1.jar.sha1 @@ -0,0 +1 @@ +9845aa3aa24196aa8d148d8c1bb5384d827eaf51 \ No newline at end of file diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.10.1.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.10.1.jar.sha1 deleted file mode 100644 index cd11905d4531e..0000000000000 --- a/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.10.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a1eec256a25340ba5d432d2800f759db83eb5145 \ No newline at end of file diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.11.1.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.11.1.jar.sha1 new file mode 100644 index 0000000000000..9f5cfee974a44 --- /dev/null +++ b/plugins/analysis-icu/licenses/lucene-analyzers-icu-8.11.1.jar.sha1 @@ -0,0 +1 @@ +bdc04b2e5733130ae3b6465f1af723d35a2dad55 \ No newline at end of file diff --git a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.10.1.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.10.1.jar.sha1 deleted file mode 100644 index 0cee3fd1fe9cf..0000000000000 --- a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.10.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d9ff6329a9755bbdb7343452bf246e61ae9279d8 \ No newline at end of file diff --git a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.11.1.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.11.1.jar.sha1 new file mode 100644 index 0000000000000..8359f4ba5f5e8 --- /dev/null +++ b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.11.1.jar.sha1 @@ -0,0 +1 @@ +ff03780e5e4acb1bd13b358b131a68374e037681 \ No newline at end of file diff --git a/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.10.1.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.10.1.jar.sha1 deleted file mode 100644 index ec8d7c98c2d6f..0000000000000 --- a/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.10.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6e78aef6d1b709ed3e27dbc949255e078da08d41 \ No newline at end of file diff --git a/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.11.1.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.11.1.jar.sha1 new file mode 100644 index 0000000000000..eed2d476d9638 --- /dev/null +++ b/plugins/analysis-nori/licenses/lucene-analyzers-nori-8.11.1.jar.sha1 @@ -0,0 +1 @@ +81371458f1ee233115335a911308bb9f18fe593e \ No newline at end of file diff --git a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.10.1.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.10.1.jar.sha1 deleted file mode 100644 index 14edf0533a00d..0000000000000 --- a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.10.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c186bf6dd0c2fa6612ba9b0d785ff2d388d32a23 \ No newline at end of file diff --git a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.11.1.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.11.1.jar.sha1 new file mode 100644 index 0000000000000..368d618583b5c --- /dev/null +++ b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.11.1.jar.sha1 @@ -0,0 +1 @@ +a571f391fbf6560ce2b2484ccefc7a89651ab3f8 \ No newline at end of file diff --git a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.10.1.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.10.1.jar.sha1 deleted file mode 100644 index 5fc06ea596458..0000000000000 --- a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.10.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ebda1884c24bb14ee451b98e7565c86966f8863d \ No newline at end of file diff --git a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.11.1.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.11.1.jar.sha1 new file mode 100644 index 0000000000000..f6399f0684d5f --- /dev/null +++ b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.11.1.jar.sha1 @@ -0,0 +1 @@ +a6c73b05a0b6cdc979216441043de2318954aa4e \ No newline at end of file diff --git a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.10.1.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.10.1.jar.sha1 deleted file mode 100644 index bf2d58255a77e..0000000000000 --- a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.10.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2a4bd86c96374cdc5acaf7c0efd5127f2fd3a519 \ No newline at end of file diff --git a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.11.1.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.11.1.jar.sha1 new file mode 100644 index 0000000000000..29633b42d4620 --- /dev/null +++ b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.11.1.jar.sha1 @@ -0,0 +1 @@ +75c39ad774dc6e3f7c921329ac61abebba1cf1df \ No newline at end of file diff --git a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.10.1.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.10.1.jar.sha1 deleted file mode 100644 index 6076c699bb7bf..0000000000000 --- a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.10.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -09de2e3fa72355228b2723f958dcb0ec1bc3f31a \ No newline at end of file diff --git a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.11.1.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.11.1.jar.sha1 new file mode 100644 index 0000000000000..2f24348076501 --- /dev/null +++ b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.11.1.jar.sha1 @@ -0,0 +1 @@ +dc46549d8819d298b7d97dd729754d13806dcd42 \ No newline at end of file diff --git a/server/licenses/lucene-analyzers-common-8.10.1.jar.sha1 b/server/licenses/lucene-analyzers-common-8.10.1.jar.sha1 deleted file mode 100644 index 685f94bcc6601..0000000000000 --- a/server/licenses/lucene-analyzers-common-8.10.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -23bb36a98d01100953674c56c20861b29b5a5175 \ No newline at end of file diff --git a/server/licenses/lucene-analyzers-common-8.11.1.jar.sha1 b/server/licenses/lucene-analyzers-common-8.11.1.jar.sha1 new file mode 100644 index 0000000000000..72739ea724a27 --- /dev/null +++ b/server/licenses/lucene-analyzers-common-8.11.1.jar.sha1 @@ -0,0 +1 @@ +e50af506f271a3f7246da054a2569b42ff73abb2 \ No newline at end of file diff --git a/server/licenses/lucene-backward-codecs-8.10.1.jar.sha1 b/server/licenses/lucene-backward-codecs-8.10.1.jar.sha1 deleted file mode 100644 index 3191833511058..0000000000000 --- a/server/licenses/lucene-backward-codecs-8.10.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7399c32bc4ba7e37e14a9660ffd7962acf68a802 \ No newline at end of file diff --git a/server/licenses/lucene-backward-codecs-8.11.1.jar.sha1 b/server/licenses/lucene-backward-codecs-8.11.1.jar.sha1 new file mode 100644 index 0000000000000..8a97762c09a14 --- /dev/null +++ b/server/licenses/lucene-backward-codecs-8.11.1.jar.sha1 @@ -0,0 +1 @@ +04fafe3e150805be67778ba5cdbae2560c893ad8 \ No newline at end of file diff --git a/server/licenses/lucene-core-8.10.1.jar.sha1 b/server/licenses/lucene-core-8.10.1.jar.sha1 deleted file mode 100644 index 77f85d74d6e6c..0000000000000 --- a/server/licenses/lucene-core-8.10.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -deb78f6b21d29f964ab267ad59fafb58ef740101 \ No newline at end of file diff --git a/server/licenses/lucene-core-8.11.1.jar.sha1 b/server/licenses/lucene-core-8.11.1.jar.sha1 new file mode 100644 index 0000000000000..4ac51ff430d83 --- /dev/null +++ b/server/licenses/lucene-core-8.11.1.jar.sha1 @@ -0,0 +1 @@ +75dcf930ece95581af3f31af5692e4963fc7ad8e \ No newline at end of file diff --git a/server/licenses/lucene-grouping-8.10.1.jar.sha1 b/server/licenses/lucene-grouping-8.10.1.jar.sha1 deleted file mode 100644 index 82dd3ba35b0a2..0000000000000 --- a/server/licenses/lucene-grouping-8.10.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7b91bb886d30c67a8f980d3bdfd6b7826a62d5e7 \ No newline at end of file diff --git a/server/licenses/lucene-grouping-8.11.1.jar.sha1 b/server/licenses/lucene-grouping-8.11.1.jar.sha1 new file mode 100644 index 0000000000000..ae2ee6ad1e95e --- /dev/null +++ b/server/licenses/lucene-grouping-8.11.1.jar.sha1 @@ -0,0 +1 @@ +538a2c45b1d99bbe14997996639b61fb6b919ab1 \ No newline at end of file diff --git a/server/licenses/lucene-highlighter-8.10.1.jar.sha1 b/server/licenses/lucene-highlighter-8.10.1.jar.sha1 deleted file mode 100644 index 901a99e05fa27..0000000000000 --- a/server/licenses/lucene-highlighter-8.10.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ec4a2103cb300aab7e6142f1c7778dd505ecb8e2 \ No newline at end of file diff --git a/server/licenses/lucene-highlighter-8.11.1.jar.sha1 b/server/licenses/lucene-highlighter-8.11.1.jar.sha1 new file mode 100644 index 0000000000000..70b1d1505aa45 --- /dev/null +++ b/server/licenses/lucene-highlighter-8.11.1.jar.sha1 @@ -0,0 +1 @@ +558a389a0d68aa7cc4c26b9128c72d0d269d471f \ No newline at end of file diff --git a/server/licenses/lucene-join-8.10.1.jar.sha1 b/server/licenses/lucene-join-8.10.1.jar.sha1 deleted file mode 100644 index b7165475dac4f..0000000000000 --- a/server/licenses/lucene-join-8.10.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -aa368e9d11660dcfcfaab1a39dd871f05fa2b031 \ No newline at end of file diff --git a/server/licenses/lucene-join-8.11.1.jar.sha1 b/server/licenses/lucene-join-8.11.1.jar.sha1 new file mode 100644 index 0000000000000..8474564d127b8 --- /dev/null +++ b/server/licenses/lucene-join-8.11.1.jar.sha1 @@ -0,0 +1 @@ +281e6c5432b7528f132be12f126b2986c3385906 \ No newline at end of file diff --git a/server/licenses/lucene-memory-8.10.1.jar.sha1 b/server/licenses/lucene-memory-8.10.1.jar.sha1 deleted file mode 100644 index ace60de0396b2..0000000000000 --- a/server/licenses/lucene-memory-8.10.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9de18bf605879647e964fd57ddf3fa6f85ca743e \ No newline at end of file diff --git a/server/licenses/lucene-memory-8.11.1.jar.sha1 b/server/licenses/lucene-memory-8.11.1.jar.sha1 new file mode 100644 index 0000000000000..bb45fa2386de9 --- /dev/null +++ b/server/licenses/lucene-memory-8.11.1.jar.sha1 @@ -0,0 +1 @@ +e6e3a3e19bf9c7860c31966d52dfbf16909f4cc0 \ No newline at end of file diff --git a/server/licenses/lucene-misc-8.10.1.jar.sha1 b/server/licenses/lucene-misc-8.10.1.jar.sha1 deleted file mode 100644 index ef9f37d080361..0000000000000 --- a/server/licenses/lucene-misc-8.10.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e9cca86ebbe010d375388c5a17216e2d2b2e76bb \ No newline at end of file diff --git a/server/licenses/lucene-misc-8.11.1.jar.sha1 b/server/licenses/lucene-misc-8.11.1.jar.sha1 new file mode 100644 index 0000000000000..2b02efc30f217 --- /dev/null +++ b/server/licenses/lucene-misc-8.11.1.jar.sha1 @@ -0,0 +1 @@ +c412eafb48b9623d1046d72d7a2139d69c80548b \ No newline at end of file diff --git a/server/licenses/lucene-queries-8.10.1.jar.sha1 b/server/licenses/lucene-queries-8.10.1.jar.sha1 deleted file mode 100644 index ee8ec29fd21f9..0000000000000 --- a/server/licenses/lucene-queries-8.10.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -21b70a0996e3408291514d99e3b03800d0bcd657 \ No newline at end of file diff --git a/server/licenses/lucene-queries-8.11.1.jar.sha1 b/server/licenses/lucene-queries-8.11.1.jar.sha1 new file mode 100644 index 0000000000000..ca25566460087 --- /dev/null +++ b/server/licenses/lucene-queries-8.11.1.jar.sha1 @@ -0,0 +1 @@ +02a0abca16b31453cbd832ba27c96fce1208db5e \ No newline at end of file diff --git a/server/licenses/lucene-queryparser-8.10.1.jar.sha1 b/server/licenses/lucene-queryparser-8.10.1.jar.sha1 deleted file mode 100644 index 3175b926c47ad..0000000000000 --- a/server/licenses/lucene-queryparser-8.10.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -087f52ee3f72f387b802c49a96e4a14b3b05dd21 \ No newline at end of file diff --git a/server/licenses/lucene-queryparser-8.11.1.jar.sha1 b/server/licenses/lucene-queryparser-8.11.1.jar.sha1 new file mode 100644 index 0000000000000..f23f0f48389c1 --- /dev/null +++ b/server/licenses/lucene-queryparser-8.11.1.jar.sha1 @@ -0,0 +1 @@ +5a44df2cb26fa1e0e64be53fe474c7f1d5a3e634 \ No newline at end of file diff --git a/server/licenses/lucene-sandbox-8.10.1.jar.sha1 b/server/licenses/lucene-sandbox-8.10.1.jar.sha1 deleted file mode 100644 index 5941c170b1e80..0000000000000 --- a/server/licenses/lucene-sandbox-8.10.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -82b15ef61297e6d7b0c1f6c37c502d6b77a82f1e \ No newline at end of file diff --git a/server/licenses/lucene-sandbox-8.11.1.jar.sha1 b/server/licenses/lucene-sandbox-8.11.1.jar.sha1 new file mode 100644 index 0000000000000..ea6e1437b1744 --- /dev/null +++ b/server/licenses/lucene-sandbox-8.11.1.jar.sha1 @@ -0,0 +1 @@ +bd4392f44a5f7ed798baca88896c0ff6a428ab90 \ No newline at end of file diff --git a/server/licenses/lucene-spatial3d-8.10.1.jar.sha1 b/server/licenses/lucene-spatial3d-8.10.1.jar.sha1 deleted file mode 100644 index 177ceb41b4205..0000000000000 --- a/server/licenses/lucene-spatial3d-8.10.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -823a5e9d2fd3b5b668d305e0781d0e074e9f2ebb \ No newline at end of file diff --git a/server/licenses/lucene-spatial3d-8.11.1.jar.sha1 b/server/licenses/lucene-spatial3d-8.11.1.jar.sha1 new file mode 100644 index 0000000000000..3260754253f2f --- /dev/null +++ b/server/licenses/lucene-spatial3d-8.11.1.jar.sha1 @@ -0,0 +1 @@ +29b1d2edfab05beb0014e6582d53c74129c5bc03 \ No newline at end of file diff --git a/server/licenses/lucene-suggest-8.10.1.jar.sha1 b/server/licenses/lucene-suggest-8.10.1.jar.sha1 deleted file mode 100644 index dae6bab002ef4..0000000000000 --- a/server/licenses/lucene-suggest-8.10.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -92d7e5a178d0df58e0b4d400755ac46bae3eea11 \ No newline at end of file diff --git a/server/licenses/lucene-suggest-8.11.1.jar.sha1 b/server/licenses/lucene-suggest-8.11.1.jar.sha1 new file mode 100644 index 0000000000000..92deef8297568 --- /dev/null +++ b/server/licenses/lucene-suggest-8.11.1.jar.sha1 @@ -0,0 +1 @@ +60bbaf1907cd3ec583df6cd0a86d62c6b25222f8 \ No newline at end of file diff --git a/server/src/main/java/org/elasticsearch/Version.java b/server/src/main/java/org/elasticsearch/Version.java index dd5f457e63960..9fc7528a38b70 100644 --- a/server/src/main/java/org/elasticsearch/Version.java +++ b/server/src/main/java/org/elasticsearch/Version.java @@ -157,7 +157,7 @@ public class Version implements Comparable, ToXContentFragment { public static final Version V_7_16_0 = new Version(7160099, org.apache.lucene.util.Version.LUCENE_8_10_1); public static final Version V_7_16_1 = new Version(7160199, org.apache.lucene.util.Version.LUCENE_8_10_1); public static final Version V_7_16_2 = new Version(7160299, org.apache.lucene.util.Version.LUCENE_8_10_1); - public static final Version V_7_17_0 = new Version(7170099, org.apache.lucene.util.Version.LUCENE_8_10_1); + public static final Version V_7_17_0 = new Version(7170099, org.apache.lucene.util.Version.LUCENE_8_11_1); public static final Version CURRENT = V_7_17_0; private static final ImmutableOpenIntMap idToVersion; diff --git a/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.10.1.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.10.1.jar.sha1 deleted file mode 100644 index 77f85d74d6e6c..0000000000000 --- a/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.10.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -deb78f6b21d29f964ab267ad59fafb58ef740101 \ No newline at end of file diff --git a/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.11.1.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.11.1.jar.sha1 new file mode 100644 index 0000000000000..4ac51ff430d83 --- /dev/null +++ b/x-pack/plugin/sql/sql-action/licenses/lucene-core-8.11.1.jar.sha1 @@ -0,0 +1 @@ +75dcf930ece95581af3f31af5692e4963fc7ad8e \ No newline at end of file