diff --git a/buildSrc/version.properties b/buildSrc/version.properties index 5efd9affaab90..2be49d6d6c854 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -1,6 +1,6 @@ # When updating elasticsearch, please update 'rest' version in core/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy elasticsearch = 6.0.0-rc2 -lucene = 7.0.0 +lucene = 7.0.1 # optional dependencies spatial4j = 0.6 diff --git a/core/licenses/lucene-analyzers-common-7.0.0.jar.sha1 b/core/licenses/lucene-analyzers-common-7.0.0.jar.sha1 deleted file mode 100644 index e630261521bd4..0000000000000 --- a/core/licenses/lucene-analyzers-common-7.0.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -91f9e9717d7cf558927bbada26a651238cacb228 \ No newline at end of file diff --git a/core/licenses/lucene-analyzers-common-7.0.1.jar.sha1 b/core/licenses/lucene-analyzers-common-7.0.1.jar.sha1 new file mode 100644 index 0000000000000..f6558203abc2d --- /dev/null +++ b/core/licenses/lucene-analyzers-common-7.0.1.jar.sha1 @@ -0,0 +1 @@ +5f6b74b083e5925b00bb89a1146c76c9a0b208e0 \ No newline at end of file diff --git a/core/licenses/lucene-backward-codecs-7.0.0.jar.sha1 b/core/licenses/lucene-backward-codecs-7.0.0.jar.sha1 deleted file mode 100644 index 68a0b9e850167..0000000000000 --- a/core/licenses/lucene-backward-codecs-7.0.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -3f03d0b56835bf8fc53ce78c3114a10df355985f \ No newline at end of file diff --git a/core/licenses/lucene-backward-codecs-7.0.1.jar.sha1 b/core/licenses/lucene-backward-codecs-7.0.1.jar.sha1 new file mode 100644 index 0000000000000..41e4385f0a788 --- /dev/null +++ b/core/licenses/lucene-backward-codecs-7.0.1.jar.sha1 @@ -0,0 +1 @@ +18638048b965511a490b84c1e2623d396b7b9a3f \ No newline at end of file diff --git a/core/licenses/lucene-core-7.0.0.jar.sha1 b/core/licenses/lucene-core-7.0.0.jar.sha1 deleted file mode 100644 index 31b29b60fe229..0000000000000 --- a/core/licenses/lucene-core-7.0.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -59a0bf5b97304ffbe577220779b4992020d49f7e \ No newline at end of file diff --git a/core/licenses/lucene-core-7.0.1.jar.sha1 b/core/licenses/lucene-core-7.0.1.jar.sha1 new file mode 100644 index 0000000000000..3e0eecc717368 --- /dev/null +++ b/core/licenses/lucene-core-7.0.1.jar.sha1 @@ -0,0 +1 @@ +3f1ad4670da69cf5b4489b59152dce4eea252ff5 \ No newline at end of file diff --git a/core/licenses/lucene-grouping-7.0.0.jar.sha1 b/core/licenses/lucene-grouping-7.0.0.jar.sha1 deleted file mode 100644 index cb0826e73a562..0000000000000 --- a/core/licenses/lucene-grouping-7.0.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -59205eb7e0d3a33ad778b60f82ca3b17e24ac6b7 \ No newline at end of file diff --git a/core/licenses/lucene-grouping-7.0.1.jar.sha1 b/core/licenses/lucene-grouping-7.0.1.jar.sha1 new file mode 100644 index 0000000000000..c8989134a6651 --- /dev/null +++ b/core/licenses/lucene-grouping-7.0.1.jar.sha1 @@ -0,0 +1 @@ +6615491d5d2017e0243c2c2e016f92a8ca12db60 \ No newline at end of file diff --git a/core/licenses/lucene-highlighter-7.0.0.jar.sha1 b/core/licenses/lucene-highlighter-7.0.0.jar.sha1 deleted file mode 100644 index ab0a5a570d1c7..0000000000000 --- a/core/licenses/lucene-highlighter-7.0.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7ce11d6b34bd43563d5d63314088799879612692 \ No newline at end of file diff --git a/core/licenses/lucene-highlighter-7.0.1.jar.sha1 b/core/licenses/lucene-highlighter-7.0.1.jar.sha1 new file mode 100644 index 0000000000000..d5496b62c3313 --- /dev/null +++ b/core/licenses/lucene-highlighter-7.0.1.jar.sha1 @@ -0,0 +1 @@ +888bf6b9a1e8bd69931e30c67fc01edd284b4c81 \ No newline at end of file diff --git a/core/licenses/lucene-join-7.0.0.jar.sha1 b/core/licenses/lucene-join-7.0.0.jar.sha1 deleted file mode 100644 index a537f656f6497..0000000000000 --- a/core/licenses/lucene-join-7.0.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4706ea3c072dea6ba6540e0c8fce56fb5704fb16 \ No newline at end of file diff --git a/core/licenses/lucene-join-7.0.1.jar.sha1 b/core/licenses/lucene-join-7.0.1.jar.sha1 new file mode 100644 index 0000000000000..d5c3d7fbe8890 --- /dev/null +++ b/core/licenses/lucene-join-7.0.1.jar.sha1 @@ -0,0 +1 @@ +bfa8769171ef4c12d347a094c90a5b314d4d7915 \ No newline at end of file diff --git a/core/licenses/lucene-memory-7.0.0.jar.sha1 b/core/licenses/lucene-memory-7.0.0.jar.sha1 deleted file mode 100644 index 049af9157b2e9..0000000000000 --- a/core/licenses/lucene-memory-7.0.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -dacd0a3717857954d83b47e46d293d1909368287 \ No newline at end of file diff --git a/core/licenses/lucene-memory-7.0.1.jar.sha1 b/core/licenses/lucene-memory-7.0.1.jar.sha1 new file mode 100644 index 0000000000000..8d171f835b480 --- /dev/null +++ b/core/licenses/lucene-memory-7.0.1.jar.sha1 @@ -0,0 +1 @@ +c9bdc376260a5c94318085f6b5ba932cfdd51ad8 \ No newline at end of file diff --git a/core/licenses/lucene-misc-7.0.0.jar.sha1 b/core/licenses/lucene-misc-7.0.0.jar.sha1 deleted file mode 100644 index 6a96c204e125f..0000000000000 --- a/core/licenses/lucene-misc-7.0.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -788bf81b746d8c445ba8abae09083b80dc571422 \ No newline at end of file diff --git a/core/licenses/lucene-misc-7.0.1.jar.sha1 b/core/licenses/lucene-misc-7.0.1.jar.sha1 new file mode 100644 index 0000000000000..d9911405e0be7 --- /dev/null +++ b/core/licenses/lucene-misc-7.0.1.jar.sha1 @@ -0,0 +1 @@ +c72dd9d63f92f0e82961dd38e169d5affdb915b0 \ No newline at end of file diff --git a/core/licenses/lucene-queries-7.0.0.jar.sha1 b/core/licenses/lucene-queries-7.0.0.jar.sha1 deleted file mode 100644 index 28ab8d34b6a01..0000000000000 --- a/core/licenses/lucene-queries-7.0.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c6168c23fd1bec9b57077693361b014b44000117 \ No newline at end of file diff --git a/core/licenses/lucene-queries-7.0.1.jar.sha1 b/core/licenses/lucene-queries-7.0.1.jar.sha1 new file mode 100644 index 0000000000000..d7c3c27769ae6 --- /dev/null +++ b/core/licenses/lucene-queries-7.0.1.jar.sha1 @@ -0,0 +1 @@ +168e774681469e0d8902680d6cfce0131d6421bf \ No newline at end of file diff --git a/core/licenses/lucene-queryparser-7.0.0.jar.sha1 b/core/licenses/lucene-queryparser-7.0.0.jar.sha1 deleted file mode 100644 index 3eb91931dd08f..0000000000000 --- a/core/licenses/lucene-queryparser-7.0.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4d007674d657274ada4f1fb29b87507aecdbcc5b \ No newline at end of file diff --git a/core/licenses/lucene-queryparser-7.0.1.jar.sha1 b/core/licenses/lucene-queryparser-7.0.1.jar.sha1 new file mode 100644 index 0000000000000..1b78c39954a33 --- /dev/null +++ b/core/licenses/lucene-queryparser-7.0.1.jar.sha1 @@ -0,0 +1 @@ +4634a493b78fe7ced32ca34dc107b753a280a276 \ No newline at end of file diff --git a/core/licenses/lucene-sandbox-7.0.0.jar.sha1 b/core/licenses/lucene-sandbox-7.0.0.jar.sha1 deleted file mode 100644 index e498ebfa2b0ce..0000000000000 --- a/core/licenses/lucene-sandbox-7.0.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d3b84a7eccc77a28be0b7f30fa40de22d89ea028 \ No newline at end of file diff --git a/core/licenses/lucene-sandbox-7.0.1.jar.sha1 b/core/licenses/lucene-sandbox-7.0.1.jar.sha1 new file mode 100644 index 0000000000000..996acc44403ea --- /dev/null +++ b/core/licenses/lucene-sandbox-7.0.1.jar.sha1 @@ -0,0 +1 @@ +a379474d929b909b1602ecfd093df8ef70f76776 \ No newline at end of file diff --git a/core/licenses/lucene-spatial-7.0.0.jar.sha1 b/core/licenses/lucene-spatial-7.0.0.jar.sha1 deleted file mode 100644 index 86d66c7f62e92..0000000000000 --- a/core/licenses/lucene-spatial-7.0.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d947e80f5214b293bba319a625eb6971941846ac \ No newline at end of file diff --git a/core/licenses/lucene-spatial-7.0.1.jar.sha1 b/core/licenses/lucene-spatial-7.0.1.jar.sha1 new file mode 100644 index 0000000000000..128ea05e47e4e --- /dev/null +++ b/core/licenses/lucene-spatial-7.0.1.jar.sha1 @@ -0,0 +1 @@ +cefbabb619f9d0abaa39ab4391c15afbd7b54afa \ No newline at end of file diff --git a/core/licenses/lucene-spatial-extras-7.0.0.jar.sha1 b/core/licenses/lucene-spatial-extras-7.0.0.jar.sha1 deleted file mode 100644 index 76101fe60c749..0000000000000 --- a/core/licenses/lucene-spatial-extras-7.0.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ac15765c81ab4151e7a6c56ba544f3cb9860d183 \ No newline at end of file diff --git a/core/licenses/lucene-spatial-extras-7.0.1.jar.sha1 b/core/licenses/lucene-spatial-extras-7.0.1.jar.sha1 new file mode 100644 index 0000000000000..21a5df34e1406 --- /dev/null +++ b/core/licenses/lucene-spatial-extras-7.0.1.jar.sha1 @@ -0,0 +1 @@ +86f777596734662402b55e24a2848f0ac4a96628 \ No newline at end of file diff --git a/core/licenses/lucene-spatial3d-7.0.0.jar.sha1 b/core/licenses/lucene-spatial3d-7.0.0.jar.sha1 deleted file mode 100644 index 1cd5d487210f8..0000000000000 --- a/core/licenses/lucene-spatial3d-7.0.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -5a795ee7914e396236ba04b0b00839e1fd2038c4 \ No newline at end of file diff --git a/core/licenses/lucene-spatial3d-7.0.1.jar.sha1 b/core/licenses/lucene-spatial3d-7.0.1.jar.sha1 new file mode 100644 index 0000000000000..0497e0f84f521 --- /dev/null +++ b/core/licenses/lucene-spatial3d-7.0.1.jar.sha1 @@ -0,0 +1 @@ +f6fa29405bccc114456abc82c7c93a2a5629c592 \ No newline at end of file diff --git a/core/licenses/lucene-suggest-7.0.0.jar.sha1 b/core/licenses/lucene-suggest-7.0.0.jar.sha1 deleted file mode 100644 index 19d2dbc4339e9..0000000000000 --- a/core/licenses/lucene-suggest-7.0.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1a17d34de6ab52050a3f33361d4ead96eb0f344c \ No newline at end of file diff --git a/core/licenses/lucene-suggest-7.0.1.jar.sha1 b/core/licenses/lucene-suggest-7.0.1.jar.sha1 new file mode 100644 index 0000000000000..5ffbb9b96b1b8 --- /dev/null +++ b/core/licenses/lucene-suggest-7.0.1.jar.sha1 @@ -0,0 +1 @@ +71cf313010f44841f9cfb70e71559af50ea8198b \ No newline at end of file diff --git a/core/src/main/java/org/elasticsearch/Version.java b/core/src/main/java/org/elasticsearch/Version.java index 6ff53cae8b441..89bd267158968 100644 --- a/core/src/main/java/org/elasticsearch/Version.java +++ b/core/src/main/java/org/elasticsearch/Version.java @@ -115,7 +115,7 @@ public class Version implements Comparable { new Version(V_6_0_0_rc1_ID, org.apache.lucene.util.Version.LUCENE_7_0_0); public static final int V_6_0_0_rc2_ID = 6000052; public static final Version V_6_0_0_rc2 = - new Version(V_6_0_0_rc2_ID, org.apache.lucene.util.Version.LUCENE_7_0_0); + new Version(V_6_0_0_rc2_ID, org.apache.lucene.util.Version.LUCENE_7_0_1); public static final Version CURRENT = V_6_0_0_rc2; // unreleased versions must be added to the above list with the suffix _UNRELEASED (with the exception of CURRENT) diff --git a/core/src/main/resources/org/elasticsearch/bootstrap/security.policy b/core/src/main/resources/org/elasticsearch/bootstrap/security.policy index 001af2b7f4c85..832530fd6d6f4 100644 --- a/core/src/main/resources/org/elasticsearch/bootstrap/security.policy +++ b/core/src/main/resources/org/elasticsearch/bootstrap/security.policy @@ -31,7 +31,7 @@ grant codeBase "${codebase.securesm-1.1.jar}" { //// Very special jar permissions: //// These are dangerous permissions that we don't want to grant to everything. -grant codeBase "${codebase.lucene-core-7.0.0.jar}" { +grant codeBase "${codebase.lucene-core-7.0.1.jar}" { // needed to allow MMapDirectory's "unmap hack" (die unmap hack, die) // java 8 package permission java.lang.RuntimePermission "accessClassInPackage.sun.misc"; @@ -42,7 +42,7 @@ grant codeBase "${codebase.lucene-core-7.0.0.jar}" { permission java.lang.RuntimePermission "accessDeclaredMembers"; }; -grant codeBase "${codebase.lucene-misc-7.0.0.jar}" { +grant codeBase "${codebase.lucene-misc-7.0.1.jar}" { // needed to allow shard shrinking to use hard-links if possible via lucenes HardlinkCopyDirectoryWrapper permission java.nio.file.LinkPermission "hard"; }; diff --git a/core/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy b/core/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy index b8d868b3cfd61..c966915931dc5 100644 --- a/core/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy +++ b/core/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy @@ -33,7 +33,7 @@ grant codeBase "${codebase.securemock-1.2.jar}" { permission java.lang.reflect.ReflectPermission "suppressAccessChecks"; }; -grant codeBase "${codebase.lucene-test-framework-7.0.0.jar}" { +grant codeBase "${codebase.lucene-test-framework-7.0.1.jar}" { // needed by RamUsageTester permission java.lang.reflect.ReflectPermission "suppressAccessChecks"; // needed for testing hardlinks in StoreRecoveryTests since we install MockFS diff --git a/docs/Versions.asciidoc b/docs/Versions.asciidoc index b0fd5a090f918..39c582eb5e11d 100644 --- a/docs/Versions.asciidoc +++ b/docs/Versions.asciidoc @@ -1,7 +1,7 @@ :version: 6.0.0-rc1 :major-version: 6.x -:lucene_version: 7.0.0 -:lucene_version_path: 7_0_0 +:lucene_version: 7.0.1 +:lucene_version_path: 7_0_1 :branch: 6.0 :jdk: 1.8.0_131 diff --git a/modules/lang-expression/licenses/lucene-expressions-7.0.0.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-7.0.0.jar.sha1 deleted file mode 100644 index a13f66c451578..0000000000000 --- a/modules/lang-expression/licenses/lucene-expressions-7.0.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -cba375c000fe184e45d439e61162c1111b77c907 \ No newline at end of file diff --git a/modules/lang-expression/licenses/lucene-expressions-7.0.1.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-7.0.1.jar.sha1 new file mode 100644 index 0000000000000..106b364e79a12 --- /dev/null +++ b/modules/lang-expression/licenses/lucene-expressions-7.0.1.jar.sha1 @@ -0,0 +1 @@ +4dee7e95dd1c4fec151ad6604825cdf696b52e88 \ No newline at end of file diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.0.0.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.0.0.jar.sha1 deleted file mode 100644 index 9441a04d2865d..0000000000000 --- a/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.0.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -37868189327b684f6df10cc29bde626d5de4cd9e \ No newline at end of file diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.0.1.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.0.1.jar.sha1 new file mode 100644 index 0000000000000..c88a4b6dab9b2 --- /dev/null +++ b/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.0.1.jar.sha1 @@ -0,0 +1 @@ +4ecc60a154a7f9de64f5bed67f990d4ddef3f95c \ No newline at end of file diff --git a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.0.0.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.0.0.jar.sha1 deleted file mode 100644 index e731e2a591f88..0000000000000 --- a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.0.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c0bdeeaa5228b20f128082da209012131521398c \ No newline at end of file diff --git a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.0.1.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.0.1.jar.sha1 new file mode 100644 index 0000000000000..aefe1ccbdaea2 --- /dev/null +++ b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.0.1.jar.sha1 @@ -0,0 +1 @@ +f7cc8d5667a915a77d8d75a42082a9bf7a4f90fa \ No newline at end of file diff --git a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.0.0.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.0.0.jar.sha1 deleted file mode 100644 index 9f7f8802f683f..0000000000000 --- a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.0.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -57b98e4d0565dacfa8e4aa998fd2577ee00c5748 \ No newline at end of file diff --git a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.0.1.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.0.1.jar.sha1 new file mode 100644 index 0000000000000..54249e8a07fb7 --- /dev/null +++ b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.0.1.jar.sha1 @@ -0,0 +1 @@ +be14b71ed53e99df493e526fbe9fe56dcf709148 \ No newline at end of file diff --git a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.0.0.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.0.0.jar.sha1 deleted file mode 100644 index e444a6b154059..0000000000000 --- a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.0.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f5a4d545012f8feb66358e39f44d2f59d708ff95 \ No newline at end of file diff --git a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.0.1.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.0.1.jar.sha1 new file mode 100644 index 0000000000000..487764e61d08d --- /dev/null +++ b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.0.1.jar.sha1 @@ -0,0 +1 @@ +78e4e9796c0d0c99c7a2c85718ae143b45a8dcfc \ No newline at end of file diff --git a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.0.0.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.0.0.jar.sha1 deleted file mode 100644 index 1901dadb307bf..0000000000000 --- a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.0.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -50c9bf11eae81b3ed3de91300714070d51301db0 \ No newline at end of file diff --git a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.0.1.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.0.1.jar.sha1 new file mode 100644 index 0000000000000..3f104d8022ac5 --- /dev/null +++ b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.0.1.jar.sha1 @@ -0,0 +1 @@ +c8d990abd4fb70b025f366200f1b57ee70fe6e49 \ No newline at end of file diff --git a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.0.0.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.0.0.jar.sha1 deleted file mode 100644 index e6d9c4b7ad830..0000000000000 --- a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.0.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9ed6e0fde67713e7002cc481d6c398e6ce3e536f \ No newline at end of file diff --git a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.0.1.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.0.1.jar.sha1 new file mode 100644 index 0000000000000..5a1b0d86f2c8c --- /dev/null +++ b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.0.1.jar.sha1 @@ -0,0 +1 @@ +ae0097a7126724c52ca105a1a4d2dfe890039c81 \ No newline at end of file