upgraded to Lucene 7.0.1

elastic · Oct 9, 2017 · b7e0867 · b7e0867
1 parent b04d00d
commit b7e0867
Show file tree

Hide file tree

Showing 49 changed files with 29 additions and 29 deletions.
diff --git 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
diff --git a/core/licenses/lucene-analyzers-common-7.0.1.jar.sha1 b/core/licenses/lucene-analyzers-common-7.0.1.jar.sha1
@@ -0,0 +1 @@
+5f6b74b083e5925b00bb89a1146c76c9a0b208e0
diff --git a/core/licenses/lucene-backward-codecs-7.0.0.jar.sha1 b/core/licenses/lucene-backward-codecs-7.0.0.jar.sha1
diff --git a/core/licenses/lucene-backward-codecs-7.0.1.jar.sha1 b/core/licenses/lucene-backward-codecs-7.0.1.jar.sha1
@@ -0,0 +1 @@
+18638048b965511a490b84c1e2623d396b7b9a3f
diff --git a/core/licenses/lucene-core-7.0.0.jar.sha1 b/core/licenses/lucene-core-7.0.0.jar.sha1
diff --git a/core/licenses/lucene-core-7.0.1.jar.sha1 b/core/licenses/lucene-core-7.0.1.jar.sha1
@@ -0,0 +1 @@
+3f1ad4670da69cf5b4489b59152dce4eea252ff5
diff --git a/core/licenses/lucene-grouping-7.0.0.jar.sha1 b/core/licenses/lucene-grouping-7.0.0.jar.sha1
diff --git a/core/licenses/lucene-grouping-7.0.1.jar.sha1 b/core/licenses/lucene-grouping-7.0.1.jar.sha1
@@ -0,0 +1 @@
+6615491d5d2017e0243c2c2e016f92a8ca12db60
diff --git a/core/licenses/lucene-highlighter-7.0.0.jar.sha1 b/core/licenses/lucene-highlighter-7.0.0.jar.sha1
diff --git a/core/licenses/lucene-highlighter-7.0.1.jar.sha1 b/core/licenses/lucene-highlighter-7.0.1.jar.sha1
@@ -0,0 +1 @@
+888bf6b9a1e8bd69931e30c67fc01edd284b4c81
diff --git a/core/licenses/lucene-join-7.0.0.jar.sha1 b/core/licenses/lucene-join-7.0.0.jar.sha1
diff --git a/core/licenses/lucene-join-7.0.1.jar.sha1 b/core/licenses/lucene-join-7.0.1.jar.sha1
@@ -0,0 +1 @@
+bfa8769171ef4c12d347a094c90a5b314d4d7915
diff --git a/core/licenses/lucene-memory-7.0.0.jar.sha1 b/core/licenses/lucene-memory-7.0.0.jar.sha1
diff --git a/core/licenses/lucene-memory-7.0.1.jar.sha1 b/core/licenses/lucene-memory-7.0.1.jar.sha1
@@ -0,0 +1 @@
+c9bdc376260a5c94318085f6b5ba932cfdd51ad8
diff --git a/core/licenses/lucene-misc-7.0.0.jar.sha1 b/core/licenses/lucene-misc-7.0.0.jar.sha1
diff --git a/core/licenses/lucene-misc-7.0.1.jar.sha1 b/core/licenses/lucene-misc-7.0.1.jar.sha1
@@ -0,0 +1 @@
+c72dd9d63f92f0e82961dd38e169d5affdb915b0
diff --git a/core/licenses/lucene-queries-7.0.0.jar.sha1 b/core/licenses/lucene-queries-7.0.0.jar.sha1
diff --git a/core/licenses/lucene-queries-7.0.1.jar.sha1 b/core/licenses/lucene-queries-7.0.1.jar.sha1
@@ -0,0 +1 @@
+168e774681469e0d8902680d6cfce0131d6421bf
diff --git a/core/licenses/lucene-queryparser-7.0.0.jar.sha1 b/core/licenses/lucene-queryparser-7.0.0.jar.sha1
diff --git a/core/licenses/lucene-queryparser-7.0.1.jar.sha1 b/core/licenses/lucene-queryparser-7.0.1.jar.sha1
@@ -0,0 +1 @@
+4634a493b78fe7ced32ca34dc107b753a280a276
diff --git a/core/licenses/lucene-sandbox-7.0.0.jar.sha1 b/core/licenses/lucene-sandbox-7.0.0.jar.sha1
diff --git a/core/licenses/lucene-sandbox-7.0.1.jar.sha1 b/core/licenses/lucene-sandbox-7.0.1.jar.sha1
@@ -0,0 +1 @@
+a379474d929b909b1602ecfd093df8ef70f76776
diff --git a/core/licenses/lucene-spatial-7.0.0.jar.sha1 b/core/licenses/lucene-spatial-7.0.0.jar.sha1
diff --git a/core/licenses/lucene-spatial-7.0.1.jar.sha1 b/core/licenses/lucene-spatial-7.0.1.jar.sha1
@@ -0,0 +1 @@
+cefbabb619f9d0abaa39ab4391c15afbd7b54afa
diff --git a/core/licenses/lucene-spatial-extras-7.0.0.jar.sha1 b/core/licenses/lucene-spatial-extras-7.0.0.jar.sha1
diff --git a/core/licenses/lucene-spatial-extras-7.0.1.jar.sha1 b/core/licenses/lucene-spatial-extras-7.0.1.jar.sha1
@@ -0,0 +1 @@
+86f777596734662402b55e24a2848f0ac4a96628
diff --git a/core/licenses/lucene-spatial3d-7.0.0.jar.sha1 b/core/licenses/lucene-spatial3d-7.0.0.jar.sha1
diff --git a/core/licenses/lucene-spatial3d-7.0.1.jar.sha1 b/core/licenses/lucene-spatial3d-7.0.1.jar.sha1
@@ -0,0 +1 @@
+f6fa29405bccc114456abc82c7c93a2a5629c592
diff --git a/core/licenses/lucene-suggest-7.0.0.jar.sha1 b/core/licenses/lucene-suggest-7.0.0.jar.sha1
diff --git a/core/licenses/lucene-suggest-7.0.1.jar.sha1 b/core/licenses/lucene-suggest-7.0.1.jar.sha1
@@ -0,0 +1 @@
+71cf313010f44841f9cfb70e71559af50ea8198b
diff --git 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<Version> {
         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
@@ -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
@@ -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
@@ -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
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
@@ -0,0 +1 @@
+4dee7e95dd1c4fec151ad6604825cdf696b52e88
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
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
@@ -0,0 +1 @@
+4ecc60a154a7f9de64f5bed67f990d4ddef3f95c
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
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
@@ -0,0 +1 @@
+f7cc8d5667a915a77d8d75a42082a9bf7a4f90fa
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
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
@@ -0,0 +1 @@
+be14b71ed53e99df493e526fbe9fe56dcf709148
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
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
@@ -0,0 +1 @@
+78e4e9796c0d0c99c7a2c85718ae143b45a8dcfc
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
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
@@ -0,0 +1 @@
+c8d990abd4fb70b025f366200f1b57ee70fe6e49
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
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
@@ -0,0 +1 @@
+ae0097a7126724c52ca105a1a4d2dfe890039c81