Upgrade to lucene-7.0.0-snapshot-a0aef2f

This commit upgrades master to a current lucene snapshot with commit id a0aef2f.

54 files changed, 41 insertions, 30 deletions

diff --git a/buildSrc/version.properties b/buildSrc/version.properties
index 69eebdd232..94f3c1c73a 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-alpha2
-lucene            = 7.0.0-snapshot-89f6d17
+lucene            = 7.0.0-snapshot-a0aef2f
 
 # optional dependencies
 spatial4j         = 0.6
diff --git a/core/licenses/lucene-analyzers-common-7.0.0-snapshot-89f6d17.jar.sha1 b/core/licenses/lucene-analyzers-common-7.0.0-snapshot-89f6d17.jar.sha1
deleted file mode 100644
index 93afa8a73f..0000000000
--- a/core/licenses/lucene-analyzers-common-7.0.0-snapshot-89f6d17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e69234c2e898d86a53edbe8d22e33bebc45286cd
\ No newline at end of file
diff --git a/core/licenses/lucene-analyzers-common-7.0.0-snapshot-a0aef2f.jar.sha1 b/core/licenses/lucene-analyzers-common-7.0.0-snapshot-a0aef2f.jar.sha1
new file mode 100644
index 0000000000..9a1f65be58
--- /dev/null
+++ b/core/licenses/lucene-analyzers-common-7.0.0-snapshot-a0aef2f.jar.sha1
@@ -0,0 +1 @@
+5e191674c50c9d99c9838da52cbf67c411998f4e
\ No newline at end of file
diff --git a/core/licenses/lucene-backward-codecs-7.0.0-snapshot-89f6d17.jar.sha1 b/core/licenses/lucene-backward-codecs-7.0.0-snapshot-89f6d17.jar.sha1
deleted file mode 100644
index 707ed41267..0000000000
--- a/core/licenses/lucene-backward-codecs-7.0.0-snapshot-89f6d17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-48172a8e1fe6562f55ab671d42af53652794d5df
\ No newline at end of file
diff --git a/core/licenses/lucene-backward-codecs-7.0.0-snapshot-a0aef2f.jar.sha1 b/core/licenses/lucene-backward-codecs-7.0.0-snapshot-a0aef2f.jar.sha1
new file mode 100644
index 0000000000..8ffb313c69
--- /dev/null
+++ b/core/licenses/lucene-backward-codecs-7.0.0-snapshot-a0aef2f.jar.sha1
@@ -0,0 +1 @@
+45bc34ab640d5d1a7491b523631b902f20db5384
\ No newline at end of file
diff --git a/core/licenses/lucene-core-7.0.0-snapshot-89f6d17.jar.sha1 b/core/licenses/lucene-core-7.0.0-snapshot-89f6d17.jar.sha1
deleted file mode 100644
index ef6a939a66..0000000000
--- a/core/licenses/lucene-core-7.0.0-snapshot-89f6d17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3dab251d4c7ab4ff5095e5f1d1e127ec2cf3c07d
\ No newline at end of file
diff --git a/core/licenses/lucene-core-7.0.0-snapshot-a0aef2f.jar.sha1 b/core/licenses/lucene-core-7.0.0-snapshot-a0aef2f.jar.sha1
new file mode 100644
index 0000000000..220b0ea521
--- /dev/null
+++ b/core/licenses/lucene-core-7.0.0-snapshot-a0aef2f.jar.sha1
@@ -0,0 +1 @@
+b44d86e9077443c3ba4918a85603734461c6b448
\ No newline at end of file
diff --git a/core/licenses/lucene-grouping-7.0.0-snapshot-89f6d17.jar.sha1 b/core/licenses/lucene-grouping-7.0.0-snapshot-89f6d17.jar.sha1
deleted file mode 100644
index dfa06b60b4..0000000000
--- a/core/licenses/lucene-grouping-7.0.0-snapshot-89f6d17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c01ae8a23b733d75d058a76bd85fcb49b9fd06fd
\ No newline at end of file
diff --git a/core/licenses/lucene-grouping-7.0.0-snapshot-a0aef2f.jar.sha1 b/core/licenses/lucene-grouping-7.0.0-snapshot-a0aef2f.jar.sha1
new file mode 100644
index 0000000000..99612cc340
--- /dev/null
+++ b/core/licenses/lucene-grouping-7.0.0-snapshot-a0aef2f.jar.sha1
@@ -0,0 +1 @@
+409b616d40e2041a02890b2dc477ed845e3121e9
\ No newline at end of file
diff --git a/core/licenses/lucene-highlighter-7.0.0-snapshot-89f6d17.jar.sha1 b/core/licenses/lucene-highlighter-7.0.0-snapshot-89f6d17.jar.sha1
deleted file mode 100644
index 51c8a47474..0000000000
--- a/core/licenses/lucene-highlighter-7.0.0-snapshot-89f6d17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c53df048b97946fe66035505306b5651b702adb1
\ No newline at end of file
diff --git a/core/licenses/lucene-highlighter-7.0.0-snapshot-a0aef2f.jar.sha1 b/core/licenses/lucene-highlighter-7.0.0-snapshot-a0aef2f.jar.sha1
new file mode 100644
index 0000000000..a3bd96546f
--- /dev/null
+++ b/core/licenses/lucene-highlighter-7.0.0-snapshot-a0aef2f.jar.sha1
@@ -0,0 +1 @@
+cfac105541315e2ca54955f681b410a7aa3bbb9d
\ No newline at end of file
diff --git a/core/licenses/lucene-join-7.0.0-snapshot-89f6d17.jar.sha1 b/core/licenses/lucene-join-7.0.0-snapshot-89f6d17.jar.sha1
deleted file mode 100644
index ad7e123f6d..0000000000
--- a/core/licenses/lucene-join-7.0.0-snapshot-89f6d17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1ecb349ba29abab75359e5125ac8a94fc81441d5
\ No newline at end of file
diff --git a/core/licenses/lucene-join-7.0.0-snapshot-a0aef2f.jar.sha1 b/core/licenses/lucene-join-7.0.0-snapshot-a0aef2f.jar.sha1
new file mode 100644
index 0000000000..92c0c80f6a
--- /dev/null
+++ b/core/licenses/lucene-join-7.0.0-snapshot-a0aef2f.jar.sha1
@@ -0,0 +1 @@
+993c1331130dd26c632b964fd8caac259bb9f3fc
\ No newline at end of file
diff --git a/core/licenses/lucene-memory-7.0.0-snapshot-89f6d17.jar.sha1 b/core/licenses/lucene-memory-7.0.0-snapshot-89f6d17.jar.sha1
deleted file mode 100644
index 6c9fc8be42..0000000000
--- a/core/licenses/lucene-memory-7.0.0-snapshot-89f6d17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e5f53b38652b1284ff254fba39e624ec117aef7d
\ No newline at end of file
diff --git a/core/licenses/lucene-memory-7.0.0-snapshot-a0aef2f.jar.sha1 b/core/licenses/lucene-memory-7.0.0-snapshot-a0aef2f.jar.sha1
new file mode 100644
index 0000000000..6de623ae88
--- /dev/null
+++ b/core/licenses/lucene-memory-7.0.0-snapshot-a0aef2f.jar.sha1
@@ -0,0 +1 @@
+ec1460a28850410112a6349a7fff27df31242295
\ No newline at end of file
diff --git a/core/licenses/lucene-misc-7.0.0-snapshot-89f6d17.jar.sha1 b/core/licenses/lucene-misc-7.0.0-snapshot-89f6d17.jar.sha1
deleted file mode 100644
index d69e68cdde..0000000000
--- a/core/licenses/lucene-misc-7.0.0-snapshot-89f6d17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2f340ed3f46d6b4c89fa31975b675c19028c15eb
\ No newline at end of file
diff --git a/core/licenses/lucene-misc-7.0.0-snapshot-a0aef2f.jar.sha1 b/core/licenses/lucene-misc-7.0.0-snapshot-a0aef2f.jar.sha1
new file mode 100644
index 0000000000..fd7a6b53d3
--- /dev/null
+++ b/core/licenses/lucene-misc-7.0.0-snapshot-a0aef2f.jar.sha1
@@ -0,0 +1 @@
+57d342dbe68cf05361ccfda6bb76f2410cac900b
\ No newline at end of file
diff --git a/core/licenses/lucene-queries-7.0.0-snapshot-89f6d17.jar.sha1 b/core/licenses/lucene-queries-7.0.0-snapshot-89f6d17.jar.sha1
deleted file mode 100644
index 1d2f98e6c8..0000000000
--- a/core/licenses/lucene-queries-7.0.0-snapshot-89f6d17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a13862fb62cc1e516d16d6b6bb3cdb906c4925f6
\ No newline at end of file
diff --git a/core/licenses/lucene-queries-7.0.0-snapshot-a0aef2f.jar.sha1 b/core/licenses/lucene-queries-7.0.0-snapshot-a0aef2f.jar.sha1
new file mode 100644
index 0000000000..e04c283d0f
--- /dev/null
+++ b/core/licenses/lucene-queries-7.0.0-snapshot-a0aef2f.jar.sha1
@@ -0,0 +1 @@
+5ed10847b6a2353ac66decd5a2ee1a1d34353049
\ No newline at end of file
diff --git a/core/licenses/lucene-queryparser-7.0.0-snapshot-89f6d17.jar.sha1 b/core/licenses/lucene-queryparser-7.0.0-snapshot-89f6d17.jar.sha1
deleted file mode 100644
index 29492f1ed6..0000000000
--- a/core/licenses/lucene-queryparser-7.0.0-snapshot-89f6d17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4e014f72a588453bae7dd1a555d741cf3bf39032
\ No newline at end of file
diff --git a/core/licenses/lucene-queryparser-7.0.0-snapshot-a0aef2f.jar.sha1 b/core/licenses/lucene-queryparser-7.0.0-snapshot-a0aef2f.jar.sha1
new file mode 100644
index 0000000000..87871dc29d
--- /dev/null
+++ b/core/licenses/lucene-queryparser-7.0.0-snapshot-a0aef2f.jar.sha1
@@ -0,0 +1 @@
+23ce6c2ea59287d8fe4fe31f466e9a58a1efe7b5
\ No newline at end of file
diff --git a/core/licenses/lucene-sandbox-7.0.0-snapshot-89f6d17.jar.sha1 b/core/licenses/lucene-sandbox-7.0.0-snapshot-89f6d17.jar.sha1
deleted file mode 100644
index 80794b3e27..0000000000
--- a/core/licenses/lucene-sandbox-7.0.0-snapshot-89f6d17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5e87d61c604d6b1c0ee5c38f09441d1b8b9c8c2b
\ No newline at end of file
diff --git a/core/licenses/lucene-sandbox-7.0.0-snapshot-a0aef2f.jar.sha1 b/core/licenses/lucene-sandbox-7.0.0-snapshot-a0aef2f.jar.sha1
new file mode 100644
index 0000000000..ea065b272c
--- /dev/null
+++ b/core/licenses/lucene-sandbox-7.0.0-snapshot-a0aef2f.jar.sha1
@@ -0,0 +1 @@
+78bda71c8e65428927136f81112a031aa9cd04d4
\ No newline at end of file
diff --git a/core/licenses/lucene-spatial-7.0.0-snapshot-89f6d17.jar.sha1 b/core/licenses/lucene-spatial-7.0.0-snapshot-89f6d17.jar.sha1
deleted file mode 100644
index 859a89f5a0..0000000000
--- a/core/licenses/lucene-spatial-7.0.0-snapshot-89f6d17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-be14aa163b339403d8ec904493c1be5dfa9baeaf
\ No newline at end of file
diff --git a/core/licenses/lucene-spatial-7.0.0-snapshot-a0aef2f.jar.sha1 b/core/licenses/lucene-spatial-7.0.0-snapshot-a0aef2f.jar.sha1
new file mode 100644
index 0000000000..c623088ce2
--- /dev/null
+++ b/core/licenses/lucene-spatial-7.0.0-snapshot-a0aef2f.jar.sha1
@@ -0,0 +1 @@
+1e7ea95e6197176015b13551c7496be4867ede45
\ No newline at end of file
diff --git a/core/licenses/lucene-spatial-extras-7.0.0-snapshot-89f6d17.jar.sha1 b/core/licenses/lucene-spatial-extras-7.0.0-snapshot-89f6d17.jar.sha1
deleted file mode 100644
index ee3c729288..0000000000
--- a/core/licenses/lucene-spatial-extras-7.0.0-snapshot-89f6d17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a2c13be0fe4c5a98a30ec6ae673be1442409817c
\ No newline at end of file
diff --git a/core/licenses/lucene-spatial-extras-7.0.0-snapshot-a0aef2f.jar.sha1 b/core/licenses/lucene-spatial-extras-7.0.0-snapshot-a0aef2f.jar.sha1
new file mode 100644
index 0000000000..e51de2208e
--- /dev/null
+++ b/core/licenses/lucene-spatial-extras-7.0.0-snapshot-a0aef2f.jar.sha1
@@ -0,0 +1 @@
+5ae4ecd6c478456395ae9a3f954b8afc13629bb9
\ No newline at end of file
diff --git a/core/licenses/lucene-spatial3d-7.0.0-snapshot-89f6d17.jar.sha1 b/core/licenses/lucene-spatial3d-7.0.0-snapshot-89f6d17.jar.sha1
deleted file mode 100644
index 28fab4a381..0000000000
--- a/core/licenses/lucene-spatial3d-7.0.0-snapshot-89f6d17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-92b8282e474845fdae31f9f239f953bc7164401f
\ No newline at end of file
diff --git a/core/licenses/lucene-spatial3d-7.0.0-snapshot-a0aef2f.jar.sha1 b/core/licenses/lucene-spatial3d-7.0.0-snapshot-a0aef2f.jar.sha1
new file mode 100644
index 0000000000..25d042e923
--- /dev/null
+++ b/core/licenses/lucene-spatial3d-7.0.0-snapshot-a0aef2f.jar.sha1
@@ -0,0 +1 @@
+d5d1a81fc290b9660a49557f848dc2a3c4f2048b
\ No newline at end of file
diff --git a/core/licenses/lucene-suggest-7.0.0-snapshot-89f6d17.jar.sha1 b/core/licenses/lucene-suggest-7.0.0-snapshot-89f6d17.jar.sha1
deleted file mode 100644
index e928966f27..0000000000
--- a/core/licenses/lucene-suggest-7.0.0-snapshot-89f6d17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1c4aaea267ed41657ebf01769bfddbcab5b27414
\ No newline at end of file
diff --git a/core/licenses/lucene-suggest-7.0.0-snapshot-a0aef2f.jar.sha1 b/core/licenses/lucene-suggest-7.0.0-snapshot-a0aef2f.jar.sha1
new file mode 100644
index 0000000000..5ac114c454
--- /dev/null
+++ b/core/licenses/lucene-suggest-7.0.0-snapshot-a0aef2f.jar.sha1
@@ -0,0 +1 @@
+d77cdd8f2782062a3b4c319c64f0fa4d804aafed
\ No newline at end of file
diff --git a/core/src/main/resources/org/elasticsearch/bootstrap/security.policy b/core/src/main/resources/org/elasticsearch/bootstrap/security.policy
index 7b1dcd788c..f6ad88c957 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-snapshot-89f6d17.jar}" {
+grant codeBase "${codebase.lucene-core-7.0.0-snapshot-a0aef2f.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-snapshot-89f6d17.jar}" {
   permission java.lang.RuntimePermission "accessDeclaredMembers";
 };
 
-grant codeBase "${codebase.lucene-misc-7.0.0-snapshot-89f6d17.jar}" {
+grant codeBase "${codebase.lucene-misc-7.0.0-snapshot-a0aef2f.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 c7267715dc..9ac1909063 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-snapshot-89f6d17.jar}" {
+grant codeBase "${codebase.lucene-test-framework-7.0.0-snapshot-a0aef2f.jar}" {
   // needed by RamUsageTester
   permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
   // needed for testing hardlinks in StoreRecoveryTests since we install MockFS
diff --git a/modules/lang-expression/licenses/lucene-expressions-7.0.0-snapshot-89f6d17.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-7.0.0-snapshot-89f6d17.jar.sha1
deleted file mode 100644
index c47ca7d206..0000000000
--- a/modules/lang-expression/licenses/lucene-expressions-7.0.0-snapshot-89f6d17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-52bc12bbc30db614056896495f30699d69eabae4
\ No newline at end of file
diff --git a/modules/lang-expression/licenses/lucene-expressions-7.0.0-snapshot-a0aef2f.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-7.0.0-snapshot-a0aef2f.jar.sha1
new file mode 100644
index 0000000000..361094b626
--- /dev/null
+++ b/modules/lang-expression/licenses/lucene-expressions-7.0.0-snapshot-a0aef2f.jar.sha1
@@ -0,0 +1 @@
+e7bfe234a793f8a1f0556def4e526d040ed636c8
\ No newline at end of file
diff --git a/modules/lang-expression/src/main/java/org/elasticsearch/script/expression/ReplaceableConstDoubleValueSource.java b/modules/lang-expression/src/main/java/org/elasticsearch/script/expression/ReplaceableConstDoubleValueSource.java
index f8daa6ddf8..128e6f8ea4 100644
--- a/modules/lang-expression/src/main/java/org/elasticsearch/script/expression/ReplaceableConstDoubleValueSource.java
+++ b/modules/lang-expression/src/main/java/org/elasticsearch/script/expression/ReplaceableConstDoubleValueSource.java
@@ -22,6 +22,7 @@ package org.elasticsearch.script.expression;
 import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.search.DoubleValues;
 import org.apache.lucene.search.DoubleValuesSource;
+import org.apache.lucene.search.Explanation;
 
 import java.io.IOException;
 
@@ -46,6 +47,14 @@ final class ReplaceableConstDoubleValueSource extends DoubleValuesSource {
     }
 
     @Override
+    public Explanation explain(LeafReaderContext ctx, int docId, Explanation scoreExplanation) throws IOException {
+        if (fv.advanceExact(docId))
+            return Explanation.match((float)fv.doubleValue(), "ReplaceableConstDoubleValues");
+        else
+            return Explanation.noMatch("ReplaceableConstDoubleValues");
+    }
+
+    @Override
     public boolean equals(Object o) {
         return o == this;
     }
diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.0.0-snapshot-89f6d17.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.0.0-snapshot-89f6d17.jar.sha1
deleted file mode 100644
index 1ac5e494f0..0000000000
--- a/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.0.0-snapshot-89f6d17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e6e6d743c100e4d7bc55480d5333d634e41856ca
\ No newline at end of file
diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.0.0-snapshot-a0aef2f.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.0.0-snapshot-a0aef2f.jar.sha1
new file mode 100644
index 0000000000..6cebd9da7b
--- /dev/null
+++ b/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.0.0-snapshot-a0aef2f.jar.sha1
@@ -0,0 +1 @@
+18e2a8a8096b13e191882aa77134e27c68e60372
\ No newline at end of file
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.0.0-snapshot-89f6d17.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.0.0-snapshot-89f6d17.jar.sha1
deleted file mode 100644
index 8be206e2c1..0000000000
--- a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.0.0-snapshot-89f6d17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e520a9c7f8a2fc9f7c575940d9b24834a592ca25
\ No newline at end of file
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.0.0-snapshot-a0aef2f.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.0.0-snapshot-a0aef2f.jar.sha1
new file mode 100644
index 0000000000..56ee53168d
--- /dev/null
+++ b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.0.0-snapshot-a0aef2f.jar.sha1
@@ -0,0 +1 @@
+236924d9d6da7e4f36535e957e9a506b4e737302
\ No newline at end of file
diff --git a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.0.0-snapshot-89f6d17.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.0.0-snapshot-89f6d17.jar.sha1
deleted file mode 100644
index 2b69050029..0000000000
--- a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.0.0-snapshot-89f6d17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-32fe29deb1c10cb7ae70d5f4d95fcc414f9813d6
\ No newline at end of file
diff --git a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.0.0-snapshot-a0aef2f.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.0.0-snapshot-a0aef2f.jar.sha1
new file mode 100644
index 0000000000..1296ea3682
--- /dev/null
+++ b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.0.0-snapshot-a0aef2f.jar.sha1
@@ -0,0 +1 @@
+f8b0087d03c65253122cbc3b3419f346204e80fe
\ No newline at end of file
diff --git a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.0.0-snapshot-89f6d17.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.0.0-snapshot-89f6d17.jar.sha1
deleted file mode 100644
index 5412498f1c..0000000000
--- a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.0.0-snapshot-89f6d17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e50f4ab0d6ebf85b282a86707309343e3260c4a2
\ No newline at end of file
diff --git a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.0.0-snapshot-a0aef2f.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.0.0-snapshot-a0aef2f.jar.sha1
new file mode 100644
index 0000000000..ec0c34c2d1
--- /dev/null
+++ b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.0.0-snapshot-a0aef2f.jar.sha1
@@ -0,0 +1 @@
+3e5102270f6c10a3b33e402ed5f8722ec2a1a338
\ No newline at end of file
diff --git a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.0.0-snapshot-89f6d17.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.0.0-snapshot-89f6d17.jar.sha1
deleted file mode 100644
index c845088ffb..0000000000
--- a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.0.0-snapshot-89f6d17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a41c22ef7dd43991e1f3555ff527ac79eb47fdca
\ No newline at end of file
diff --git a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.0.0-snapshot-a0aef2f.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.0.0-snapshot-a0aef2f.jar.sha1
new file mode 100644
index 0000000000..cfbd6ca298
--- /dev/null
+++ b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.0.0-snapshot-a0aef2f.jar.sha1
@@ -0,0 +1 @@
+6d9730ec654bdcf943a4018a5695e7954159ceda
\ No newline at end of file
diff --git a/plugins/analysis-ukrainian/build.gradle b/plugins/analysis-ukrainian/build.gradle
index b3c5473a2f..61f67021a3 100644
--- a/plugins/analysis-ukrainian/build.gradle
+++ b/plugins/analysis-ukrainian/build.gradle
@@ -24,8 +24,9 @@ esplugin {
 
 dependencies {
   compile "org.apache.lucene:lucene-analyzers-morfologik:${versions.lucene}"
-  compile "org.carrot2:morfologik-stemming:2.1.0"
-  compile "org.carrot2:morfologik-fsa:2.1.0"
+  compile "org.carrot2:morfologik-stemming:2.1.1"
+  compile "org.carrot2:morfologik-fsa:2.1.1"
+  compile "ua.net.nlp:morfologik-ukrainian-search:3.7.5"
 }
 
 dependencyLicenses {
diff --git a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.0.0-snapshot-89f6d17.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.0.0-snapshot-89f6d17.jar.sha1
deleted file mode 100644
index 973047cdf8..0000000000
--- a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.0.0-snapshot-89f6d17.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-01fe11b45d9f6a68ef1e9994bebd81d26632efc5
\ No newline at end of file
diff --git a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.0.0-snapshot-a0aef2f.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.0.0-snapshot-a0aef2f.jar.sha1
new file mode 100644
index 0000000000..5c15573f5b
--- /dev/null
+++ b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.0.0-snapshot-a0aef2f.jar.sha1
@@ -0,0 +1 @@
+26d01ae0d15243b30874b2cb609be5d041890459
\ No newline at end of file
diff --git a/plugins/analysis-ukrainian/licenses/morfologik-fsa-2.1.0.jar.sha1 b/plugins/analysis-ukrainian/licenses/morfologik-fsa-2.1.0.jar.sha1
deleted file mode 100644
index 88f43752db..0000000000
--- a/plugins/analysis-ukrainian/licenses/morfologik-fsa-2.1.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-88e5993f73c102f378c711f6e47221b7a9e22d25
\ No newline at end of file
diff --git a/plugins/analysis-ukrainian/licenses/morfologik-fsa-2.1.1.jar.sha1 b/plugins/analysis-ukrainian/licenses/morfologik-fsa-2.1.1.jar.sha1
new file mode 100644
index 0000000000..07d523ec0c
--- /dev/null
+++ b/plugins/analysis-ukrainian/licenses/morfologik-fsa-2.1.1.jar.sha1
@@ -0,0 +1 @@
+87866deba6aa5d19956fbe3406d8ddb5f19f5352
\ No newline at end of file
diff --git a/plugins/analysis-ukrainian/licenses/morfologik-stemming-2.1.0.jar.sha1 b/plugins/analysis-ukrainian/licenses/morfologik-stemming-2.1.0.jar.sha1
deleted file mode 100644
index ec449346c7..0000000000
--- a/plugins/analysis-ukrainian/licenses/morfologik-stemming-2.1.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-94167b64752138a246cc33cbf1a3b0bfe5274b7c
\ No newline at end of file
diff --git a/plugins/analysis-ukrainian/licenses/morfologik-stemming-2.1.1.jar.sha1 b/plugins/analysis-ukrainian/licenses/morfologik-stemming-2.1.1.jar.sha1
new file mode 100644
index 0000000000..22af41d2b6
--- /dev/null
+++ b/plugins/analysis-ukrainian/licenses/morfologik-stemming-2.1.1.jar.sha1
@@ -0,0 +1 @@
+5c169bab2e7dd04f5cb03d179a73a4339cc1d0a2
\ No newline at end of file
diff --git a/plugins/analysis-ukrainian/licenses/morfologik-ukrainian-search-3.7.5.jar.sha1 b/plugins/analysis-ukrainian/licenses/morfologik-ukrainian-search-3.7.5.jar.sha1
new file mode 100644
index 0000000000..446e7a9116
--- /dev/null
+++ b/plugins/analysis-ukrainian/licenses/morfologik-ukrainian-search-3.7.5.jar.sha1
@@ -0,0 +1 @@
+2b8c8fbd740164d220ca7d18605b8b2092e163e9
\ No newline at end of file