From 5ae810991ca5cf3862919a6a4fa1629381741b0b Mon Sep 17 00:00:00 2001
From: Adrien Grand <jpountz@gmail.com>
Date: Tue, 13 Oct 2015 00:43:12 +0200
Subject: [PATCH] Upgrade to lucene-5.4-snapshot-1708254.

---
 .../lucene/search/suggest/analyzing/XAnalyzingSuggester.java | 2 +-
 .../org/elasticsearch/index/query/GeoShapeQueryBuilder.java  | 5 ++---
 .../test/java/org/elasticsearch/search/geo/GeoFilterIT.java  | 2 +-
 .../lucene-analyzers-common-5.4.0-snapshot-1702855.jar.sha1  | 1 -
 .../lucene-analyzers-common-5.4.0-snapshot-1708254.jar.sha1  | 1 +
 .../lucene-backward-codecs-5.4.0-snapshot-1702855.jar.sha1   | 1 -
 .../lucene-backward-codecs-5.4.0-snapshot-1708254.jar.sha1   | 1 +
 .../licenses/lucene-core-5.4.0-snapshot-1702855.jar.sha1     | 1 -
 .../licenses/lucene-core-5.4.0-snapshot-1708254.jar.sha1     | 1 +
 .../licenses/lucene-grouping-5.4.0-snapshot-1702855.jar.sha1 | 1 -
 .../licenses/lucene-grouping-5.4.0-snapshot-1708254.jar.sha1 | 1 +
 .../lucene-highlighter-5.4.0-snapshot-1702855.jar.sha1       | 1 -
 .../lucene-highlighter-5.4.0-snapshot-1708254.jar.sha1       | 1 +
 .../licenses/lucene-join-5.4.0-snapshot-1702855.jar.sha1     | 1 -
 .../licenses/lucene-join-5.4.0-snapshot-1708254.jar.sha1     | 1 +
 .../licenses/lucene-memory-5.4.0-snapshot-1702855.jar.sha1   | 1 -
 .../licenses/lucene-memory-5.4.0-snapshot-1708254.jar.sha1   | 1 +
 .../licenses/lucene-misc-5.4.0-snapshot-1702855.jar.sha1     | 1 -
 .../licenses/lucene-misc-5.4.0-snapshot-1708254.jar.sha1     | 1 +
 .../licenses/lucene-queries-5.4.0-snapshot-1702855.jar.sha1  | 1 -
 .../licenses/lucene-queries-5.4.0-snapshot-1708254.jar.sha1  | 1 +
 .../lucene-queryparser-5.4.0-snapshot-1702855.jar.sha1       | 1 -
 .../lucene-queryparser-5.4.0-snapshot-1708254.jar.sha1       | 1 +
 .../licenses/lucene-sandbox-5.4.0-snapshot-1702855.jar.sha1  | 1 -
 .../licenses/lucene-sandbox-5.4.0-snapshot-1708254.jar.sha1  | 1 +
 .../licenses/lucene-spatial-5.4.0-snapshot-1702855.jar.sha1  | 1 -
 .../licenses/lucene-spatial-5.4.0-snapshot-1708254.jar.sha1  | 1 +
 .../lucene-spatial3d-5.4.0-snapshot-1702855.jar.sha1         | 1 -
 .../lucene-spatial3d-5.4.0-snapshot-1708254.jar.sha1         | 1 +
 .../licenses/lucene-suggest-5.4.0-snapshot-1702855.jar.sha1  | 1 -
 .../licenses/lucene-suggest-5.4.0-snapshot-1708254.jar.sha1  | 1 +
 distribution/licenses/spatial4j-0.5-tests.jar.sha1           | 1 +
 .../lucene-analyzers-icu-5.4.0-snapshot-1702855.jar.sha1     | 1 -
 .../lucene-analyzers-icu-5.4.0-snapshot-1708254.jar.sha1     | 1 +
 ...lucene-analyzers-kuromoji-5.4.0-snapshot-1702855.jar.sha1 | 1 -
 ...lucene-analyzers-kuromoji-5.4.0-snapshot-1708254.jar.sha1 | 1 +
 ...lucene-analyzers-phonetic-5.4.0-snapshot-1702855.jar.sha1 | 1 -
 ...lucene-analyzers-phonetic-5.4.0-snapshot-1708254.jar.sha1 | 1 +
 .../lucene-analyzers-smartcn-5.4.0-snapshot-1702855.jar.sha1 | 1 -
 .../lucene-analyzers-smartcn-5.4.0-snapshot-1708254.jar.sha1 | 1 +
 .../lucene-analyzers-stempel-5.4.0-snapshot-1702855.jar.sha1 | 1 -
 .../lucene-analyzers-stempel-5.4.0-snapshot-1708254.jar.sha1 | 1 +
 .../lucene-expressions-5.4.0-snapshot-1702855.jar.sha1       | 1 -
 .../lucene-expressions-5.4.0-snapshot-1708254.jar.sha1       | 1 +
 pom.xml                                                      | 2 +-
 45 files changed, 26 insertions(+), 26 deletions(-)
 delete mode 100644 distribution/licenses/lucene-analyzers-common-5.4.0-snapshot-1702855.jar.sha1
 create mode 100644 distribution/licenses/lucene-analyzers-common-5.4.0-snapshot-1708254.jar.sha1
 delete mode 100644 distribution/licenses/lucene-backward-codecs-5.4.0-snapshot-1702855.jar.sha1
 create mode 100644 distribution/licenses/lucene-backward-codecs-5.4.0-snapshot-1708254.jar.sha1
 delete mode 100644 distribution/licenses/lucene-core-5.4.0-snapshot-1702855.jar.sha1
 create mode 100644 distribution/licenses/lucene-core-5.4.0-snapshot-1708254.jar.sha1
 delete mode 100644 distribution/licenses/lucene-grouping-5.4.0-snapshot-1702855.jar.sha1
 create mode 100644 distribution/licenses/lucene-grouping-5.4.0-snapshot-1708254.jar.sha1
 delete mode 100644 distribution/licenses/lucene-highlighter-5.4.0-snapshot-1702855.jar.sha1
 create mode 100644 distribution/licenses/lucene-highlighter-5.4.0-snapshot-1708254.jar.sha1
 delete mode 100644 distribution/licenses/lucene-join-5.4.0-snapshot-1702855.jar.sha1
 create mode 100644 distribution/licenses/lucene-join-5.4.0-snapshot-1708254.jar.sha1
 delete mode 100644 distribution/licenses/lucene-memory-5.4.0-snapshot-1702855.jar.sha1
 create mode 100644 distribution/licenses/lucene-memory-5.4.0-snapshot-1708254.jar.sha1
 delete mode 100644 distribution/licenses/lucene-misc-5.4.0-snapshot-1702855.jar.sha1
 create mode 100644 distribution/licenses/lucene-misc-5.4.0-snapshot-1708254.jar.sha1
 delete mode 100644 distribution/licenses/lucene-queries-5.4.0-snapshot-1702855.jar.sha1
 create mode 100644 distribution/licenses/lucene-queries-5.4.0-snapshot-1708254.jar.sha1
 delete mode 100644 distribution/licenses/lucene-queryparser-5.4.0-snapshot-1702855.jar.sha1
 create mode 100644 distribution/licenses/lucene-queryparser-5.4.0-snapshot-1708254.jar.sha1
 delete mode 100644 distribution/licenses/lucene-sandbox-5.4.0-snapshot-1702855.jar.sha1
 create mode 100644 distribution/licenses/lucene-sandbox-5.4.0-snapshot-1708254.jar.sha1
 delete mode 100644 distribution/licenses/lucene-spatial-5.4.0-snapshot-1702855.jar.sha1
 create mode 100644 distribution/licenses/lucene-spatial-5.4.0-snapshot-1708254.jar.sha1
 delete mode 100644 distribution/licenses/lucene-spatial3d-5.4.0-snapshot-1702855.jar.sha1
 create mode 100644 distribution/licenses/lucene-spatial3d-5.4.0-snapshot-1708254.jar.sha1
 delete mode 100644 distribution/licenses/lucene-suggest-5.4.0-snapshot-1702855.jar.sha1
 create mode 100644 distribution/licenses/lucene-suggest-5.4.0-snapshot-1708254.jar.sha1
 create mode 100644 distribution/licenses/spatial4j-0.5-tests.jar.sha1
 delete mode 100644 plugins/analysis-icu/licenses/lucene-analyzers-icu-5.4.0-snapshot-1702855.jar.sha1
 create mode 100644 plugins/analysis-icu/licenses/lucene-analyzers-icu-5.4.0-snapshot-1708254.jar.sha1
 delete mode 100644 plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-5.4.0-snapshot-1702855.jar.sha1
 create mode 100644 plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-5.4.0-snapshot-1708254.jar.sha1
 delete mode 100644 plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-5.4.0-snapshot-1702855.jar.sha1
 create mode 100644 plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-5.4.0-snapshot-1708254.jar.sha1
 delete mode 100644 plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-5.4.0-snapshot-1702855.jar.sha1
 create mode 100644 plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-5.4.0-snapshot-1708254.jar.sha1
 delete mode 100644 plugins/analysis-stempel/licenses/lucene-analyzers-stempel-5.4.0-snapshot-1702855.jar.sha1
 create mode 100644 plugins/analysis-stempel/licenses/lucene-analyzers-stempel-5.4.0-snapshot-1708254.jar.sha1
 delete mode 100644 plugins/lang-expression/licenses/lucene-expressions-5.4.0-snapshot-1702855.jar.sha1
 create mode 100644 plugins/lang-expression/licenses/lucene-expressions-5.4.0-snapshot-1708254.jar.sha1

diff --git a/core/src/main/java/org/apache/lucene/search/suggest/analyzing/XAnalyzingSuggester.java b/core/src/main/java/org/apache/lucene/search/suggest/analyzing/XAnalyzingSuggester.java
index b2b23a29981..a6077f8e842 100644
--- a/core/src/main/java/org/apache/lucene/search/suggest/analyzing/XAnalyzingSuggester.java
+++ b/core/src/main/java/org/apache/lucene/search/suggest/analyzing/XAnalyzingSuggester.java
@@ -453,7 +453,7 @@ public long ramBytesUsed() {
   @Override
   public void build(InputIterator iterator) throws IOException {
     String prefix = getClass().getSimpleName();
-    Path directory = OfflineSorter.defaultTempDir();
+    Path directory = OfflineSorter.getDefaultTempDir();
     Path tempInput = Files.createTempFile(directory, prefix, ".input");
     Path tempSorted = Files.createTempFile(directory, prefix, ".sorted");
 
diff --git a/core/src/main/java/org/elasticsearch/index/query/GeoShapeQueryBuilder.java b/core/src/main/java/org/elasticsearch/index/query/GeoShapeQueryBuilder.java
index 72c226f8b00..dfe767b3bc6 100644
--- a/core/src/main/java/org/elasticsearch/index/query/GeoShapeQueryBuilder.java
+++ b/core/src/main/java/org/elasticsearch/index/query/GeoShapeQueryBuilder.java
@@ -22,7 +22,6 @@ package org.elasticsearch.index.query;
 import org.apache.lucene.search.BooleanClause;
 import org.apache.lucene.search.BooleanQuery;
 import org.apache.lucene.search.ConstantScoreQuery;
-import org.apache.lucene.search.Filter;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.spatial.prefix.PrefixTreeStrategy;
 import org.apache.lucene.spatial.prefix.RecursivePrefixTreeStrategy;
@@ -294,12 +293,12 @@ public class GeoShapeQueryBuilder extends AbstractQueryBuilder<GeoShapeQueryBuil
             // in this case, execute disjoint as exists && !intersects
             BooleanQuery.Builder bool = new BooleanQuery.Builder();
             Query exists = ExistsQueryBuilder.newFilter(context, fieldName);
-            Filter intersects = strategy.makeFilter(getArgs(shape, ShapeRelation.INTERSECTS));
+            Query intersects = strategy.makeQuery(getArgs(shape, ShapeRelation.INTERSECTS));
             bool.add(exists, BooleanClause.Occur.MUST);
             bool.add(intersects, BooleanClause.Occur.MUST_NOT);
             query = new ConstantScoreQuery(bool.build());
         } else {
-            query = strategy.makeQuery(getArgs(shape, relation));
+            query = new ConstantScoreQuery(strategy.makeQuery(getArgs(shape, relation)));
         }
         return query;
     }
diff --git a/core/src/test/java/org/elasticsearch/search/geo/GeoFilterIT.java b/core/src/test/java/org/elasticsearch/search/geo/GeoFilterIT.java
index b2b1b6f1783..152c3c95eca 100644
--- a/core/src/test/java/org/elasticsearch/search/geo/GeoFilterIT.java
+++ b/core/src/test/java/org/elasticsearch/search/geo/GeoFilterIT.java
@@ -584,7 +584,7 @@ public class GeoFilterIT extends ESIntegTestCase {
             RecursivePrefixTreeStrategy strategy = new RecursivePrefixTreeStrategy(tree, "area");
             Shape shape = SpatialContext.GEO.makePoint(0, 0);
             SpatialArgs args = new SpatialArgs(relation, shape);
-            strategy.makeFilter(args);
+            strategy.makeQuery(args);
             return true;
         } catch (UnsupportedSpatialOperation e) {
             e.printStackTrace();
diff --git a/distribution/licenses/lucene-analyzers-common-5.4.0-snapshot-1702855.jar.sha1 b/distribution/licenses/lucene-analyzers-common-5.4.0-snapshot-1702855.jar.sha1
deleted file mode 100644
index 961bc6ff551..00000000000
--- a/distribution/licenses/lucene-analyzers-common-5.4.0-snapshot-1702855.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5792c4b38aa2cf1f66c9dea8bf139907e33fa018
diff --git a/distribution/licenses/lucene-analyzers-common-5.4.0-snapshot-1708254.jar.sha1 b/distribution/licenses/lucene-analyzers-common-5.4.0-snapshot-1708254.jar.sha1
new file mode 100644
index 00000000000..70aab5b26fb
--- /dev/null
+++ b/distribution/licenses/lucene-analyzers-common-5.4.0-snapshot-1708254.jar.sha1
@@ -0,0 +1 @@
+16aa0bdb66b7471e9a26f78a9a5701f678a905db
diff --git a/distribution/licenses/lucene-backward-codecs-5.4.0-snapshot-1702855.jar.sha1 b/distribution/licenses/lucene-backward-codecs-5.4.0-snapshot-1702855.jar.sha1
deleted file mode 100644
index 55354f421a5..00000000000
--- a/distribution/licenses/lucene-backward-codecs-5.4.0-snapshot-1702855.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-cd6fa25bc29718d8c964b0734fc9a009547453db
diff --git a/distribution/licenses/lucene-backward-codecs-5.4.0-snapshot-1708254.jar.sha1 b/distribution/licenses/lucene-backward-codecs-5.4.0-snapshot-1708254.jar.sha1
new file mode 100644
index 00000000000..49444103062
--- /dev/null
+++ b/distribution/licenses/lucene-backward-codecs-5.4.0-snapshot-1708254.jar.sha1
@@ -0,0 +1 @@
+7f16ec8294a09118237817d8c9c03b87cec67e29
diff --git a/distribution/licenses/lucene-core-5.4.0-snapshot-1702855.jar.sha1 b/distribution/licenses/lucene-core-5.4.0-snapshot-1702855.jar.sha1
deleted file mode 100644
index 938d27bd3cf..00000000000
--- a/distribution/licenses/lucene-core-5.4.0-snapshot-1702855.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e4e0076ce4331309d1270a9c5b2edb51915fe32a
diff --git a/distribution/licenses/lucene-core-5.4.0-snapshot-1708254.jar.sha1 b/distribution/licenses/lucene-core-5.4.0-snapshot-1708254.jar.sha1
new file mode 100644
index 00000000000..237fe0d2597
--- /dev/null
+++ b/distribution/licenses/lucene-core-5.4.0-snapshot-1708254.jar.sha1
@@ -0,0 +1 @@
+0a2305ed749cb8abc321ee50b871097b4bda8a64
diff --git a/distribution/licenses/lucene-grouping-5.4.0-snapshot-1702855.jar.sha1 b/distribution/licenses/lucene-grouping-5.4.0-snapshot-1702855.jar.sha1
deleted file mode 100644
index 98041824d8d..00000000000
--- a/distribution/licenses/lucene-grouping-5.4.0-snapshot-1702855.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-49992ef742b6d3a24b551e06c96c0ab9cbad21e7
diff --git a/distribution/licenses/lucene-grouping-5.4.0-snapshot-1708254.jar.sha1 b/distribution/licenses/lucene-grouping-5.4.0-snapshot-1708254.jar.sha1
new file mode 100644
index 00000000000..9f42b06abd6
--- /dev/null
+++ b/distribution/licenses/lucene-grouping-5.4.0-snapshot-1708254.jar.sha1
@@ -0,0 +1 @@
+51ed4b60eddd2ce38fcdc8c89903c1ece336ab4f
diff --git a/distribution/licenses/lucene-highlighter-5.4.0-snapshot-1702855.jar.sha1 b/distribution/licenses/lucene-highlighter-5.4.0-snapshot-1702855.jar.sha1
deleted file mode 100644
index 7c9ca048217..00000000000
--- a/distribution/licenses/lucene-highlighter-5.4.0-snapshot-1702855.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-85544da78c2d33b2fdfa6f76eb621c8c963eae37
diff --git a/distribution/licenses/lucene-highlighter-5.4.0-snapshot-1708254.jar.sha1 b/distribution/licenses/lucene-highlighter-5.4.0-snapshot-1708254.jar.sha1
new file mode 100644
index 00000000000..164bfa24035
--- /dev/null
+++ b/distribution/licenses/lucene-highlighter-5.4.0-snapshot-1708254.jar.sha1
@@ -0,0 +1 @@
+d71c018d888dc5fe71c7fb20c2a6009c36ef117f
diff --git a/distribution/licenses/lucene-join-5.4.0-snapshot-1702855.jar.sha1 b/distribution/licenses/lucene-join-5.4.0-snapshot-1702855.jar.sha1
deleted file mode 100644
index ed8c024b716..00000000000
--- a/distribution/licenses/lucene-join-5.4.0-snapshot-1702855.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5c8b58d902a01cfce046e656eddee5c4e0578316
diff --git a/distribution/licenses/lucene-join-5.4.0-snapshot-1708254.jar.sha1 b/distribution/licenses/lucene-join-5.4.0-snapshot-1708254.jar.sha1
new file mode 100644
index 00000000000..029fd0523d9
--- /dev/null
+++ b/distribution/licenses/lucene-join-5.4.0-snapshot-1708254.jar.sha1
@@ -0,0 +1 @@
+5e82bc11bccb55af5d88d5526abe9bd3d04f0d13
diff --git a/distribution/licenses/lucene-memory-5.4.0-snapshot-1702855.jar.sha1 b/distribution/licenses/lucene-memory-5.4.0-snapshot-1702855.jar.sha1
deleted file mode 100644
index 3edae47a468..00000000000
--- a/distribution/licenses/lucene-memory-5.4.0-snapshot-1702855.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-55202617e88437dd6def4e42ceb42d18d08a9f6e
diff --git a/distribution/licenses/lucene-memory-5.4.0-snapshot-1708254.jar.sha1 b/distribution/licenses/lucene-memory-5.4.0-snapshot-1708254.jar.sha1
new file mode 100644
index 00000000000..26f5148a59e
--- /dev/null
+++ b/distribution/licenses/lucene-memory-5.4.0-snapshot-1708254.jar.sha1
@@ -0,0 +1 @@
+0dfec35d41e7120e48cf6d0ae16a88ef2949e778
diff --git a/distribution/licenses/lucene-misc-5.4.0-snapshot-1702855.jar.sha1 b/distribution/licenses/lucene-misc-5.4.0-snapshot-1702855.jar.sha1
deleted file mode 100644
index ce5a5e7d435..00000000000
--- a/distribution/licenses/lucene-misc-5.4.0-snapshot-1702855.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-50b8439558061d0bbf09ddf8144d769143d33f00
diff --git a/distribution/licenses/lucene-misc-5.4.0-snapshot-1708254.jar.sha1 b/distribution/licenses/lucene-misc-5.4.0-snapshot-1708254.jar.sha1
new file mode 100644
index 00000000000..004205b8f61
--- /dev/null
+++ b/distribution/licenses/lucene-misc-5.4.0-snapshot-1708254.jar.sha1
@@ -0,0 +1 @@
+30ddb3175c08d443c5a9f74e50e50e3a95afa72d
diff --git a/distribution/licenses/lucene-queries-5.4.0-snapshot-1702855.jar.sha1 b/distribution/licenses/lucene-queries-5.4.0-snapshot-1702855.jar.sha1
deleted file mode 100644
index 938aa1d45a0..00000000000
--- a/distribution/licenses/lucene-queries-5.4.0-snapshot-1702855.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ce470e38912676ebc63838635663f17d8db844f5
diff --git a/distribution/licenses/lucene-queries-5.4.0-snapshot-1708254.jar.sha1 b/distribution/licenses/lucene-queries-5.4.0-snapshot-1708254.jar.sha1
new file mode 100644
index 00000000000..8ae9588eaf6
--- /dev/null
+++ b/distribution/licenses/lucene-queries-5.4.0-snapshot-1708254.jar.sha1
@@ -0,0 +1 @@
+5e45b31ff8374ac5dc651ac2477dde5299b7e746
diff --git a/distribution/licenses/lucene-queryparser-5.4.0-snapshot-1702855.jar.sha1 b/distribution/licenses/lucene-queryparser-5.4.0-snapshot-1702855.jar.sha1
deleted file mode 100644
index 25390b153da..00000000000
--- a/distribution/licenses/lucene-queryparser-5.4.0-snapshot-1702855.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-318e192d61eb28de09cc62c42d4e9d044a497e8b
diff --git a/distribution/licenses/lucene-queryparser-5.4.0-snapshot-1708254.jar.sha1 b/distribution/licenses/lucene-queryparser-5.4.0-snapshot-1708254.jar.sha1
new file mode 100644
index 00000000000..e6fd31e99fa
--- /dev/null
+++ b/distribution/licenses/lucene-queryparser-5.4.0-snapshot-1708254.jar.sha1
@@ -0,0 +1 @@
+ff0780a5ad9620036f80114b2ce0b30d25647a62
diff --git a/distribution/licenses/lucene-sandbox-5.4.0-snapshot-1702855.jar.sha1 b/distribution/licenses/lucene-sandbox-5.4.0-snapshot-1702855.jar.sha1
deleted file mode 100644
index 25b114cc5ef..00000000000
--- a/distribution/licenses/lucene-sandbox-5.4.0-snapshot-1702855.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-043b3c3c03a5e0687884e5894754933d7e8f2f3e
diff --git a/distribution/licenses/lucene-sandbox-5.4.0-snapshot-1708254.jar.sha1 b/distribution/licenses/lucene-sandbox-5.4.0-snapshot-1708254.jar.sha1
new file mode 100644
index 00000000000..e687bd7dca0
--- /dev/null
+++ b/distribution/licenses/lucene-sandbox-5.4.0-snapshot-1708254.jar.sha1
@@ -0,0 +1 @@
+7679111888ccd185db0b360954777e68364eb88a
diff --git a/distribution/licenses/lucene-spatial-5.4.0-snapshot-1702855.jar.sha1 b/distribution/licenses/lucene-spatial-5.4.0-snapshot-1702855.jar.sha1
deleted file mode 100644
index 823fe3ab4f5..00000000000
--- a/distribution/licenses/lucene-spatial-5.4.0-snapshot-1702855.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a9ab07d808456d9a2de248f3b4eba9765808b1cb
diff --git a/distribution/licenses/lucene-spatial-5.4.0-snapshot-1708254.jar.sha1 b/distribution/licenses/lucene-spatial-5.4.0-snapshot-1708254.jar.sha1
new file mode 100644
index 00000000000..a649c94eea7
--- /dev/null
+++ b/distribution/licenses/lucene-spatial-5.4.0-snapshot-1708254.jar.sha1
@@ -0,0 +1 @@
+a1699a0ed320c4db66ae4e8dc9dfd80e4bfc4017
diff --git a/distribution/licenses/lucene-spatial3d-5.4.0-snapshot-1702855.jar.sha1 b/distribution/licenses/lucene-spatial3d-5.4.0-snapshot-1702855.jar.sha1
deleted file mode 100644
index 84e38b7424d..00000000000
--- a/distribution/licenses/lucene-spatial3d-5.4.0-snapshot-1702855.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c9ae48e40c89364e0e69f27c514c924d52e0d57e
diff --git a/distribution/licenses/lucene-spatial3d-5.4.0-snapshot-1708254.jar.sha1 b/distribution/licenses/lucene-spatial3d-5.4.0-snapshot-1708254.jar.sha1
new file mode 100644
index 00000000000..c7f799d4b62
--- /dev/null
+++ b/distribution/licenses/lucene-spatial3d-5.4.0-snapshot-1708254.jar.sha1
@@ -0,0 +1 @@
+7bcd15e2e685a8c92f48c3d2f355d2dd63073420
diff --git a/distribution/licenses/lucene-suggest-5.4.0-snapshot-1702855.jar.sha1 b/distribution/licenses/lucene-suggest-5.4.0-snapshot-1702855.jar.sha1
deleted file mode 100644
index e2ba8be0c55..00000000000
--- a/distribution/licenses/lucene-suggest-5.4.0-snapshot-1702855.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8bd8fb7e75746fd7bce00b4d2813fca738d68f0b
diff --git a/distribution/licenses/lucene-suggest-5.4.0-snapshot-1708254.jar.sha1 b/distribution/licenses/lucene-suggest-5.4.0-snapshot-1708254.jar.sha1
new file mode 100644
index 00000000000..3382df6a549
--- /dev/null
+++ b/distribution/licenses/lucene-suggest-5.4.0-snapshot-1708254.jar.sha1
@@ -0,0 +1 @@
+be74ad2360527cca776379499254f355ccd93484
diff --git a/distribution/licenses/spatial4j-0.5-tests.jar.sha1 b/distribution/licenses/spatial4j-0.5-tests.jar.sha1
new file mode 100644
index 00000000000..0c514f8835e
--- /dev/null
+++ b/distribution/licenses/spatial4j-0.5-tests.jar.sha1
@@ -0,0 +1 @@
+bdcdf20a723516a233b5bcc0ca7d4decaa88b6ed
diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-5.4.0-snapshot-1702855.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-5.4.0-snapshot-1702855.jar.sha1
deleted file mode 100644
index 8d39139d91c..00000000000
--- a/plugins/analysis-icu/licenses/lucene-analyzers-icu-5.4.0-snapshot-1702855.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a71d7e2780ae064a6e6ea5b43357d070351620b8
diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-5.4.0-snapshot-1708254.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-5.4.0-snapshot-1708254.jar.sha1
new file mode 100644
index 00000000000..53f66772d49
--- /dev/null
+++ b/plugins/analysis-icu/licenses/lucene-analyzers-icu-5.4.0-snapshot-1708254.jar.sha1
@@ -0,0 +1 @@
+0ffcda4683ae66ecb96882a6809516d9a288ba52
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-5.4.0-snapshot-1702855.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-5.4.0-snapshot-1702855.jar.sha1
deleted file mode 100644
index 69991e5f6ad..00000000000
--- a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-5.4.0-snapshot-1702855.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a82b7a125e7cc16c6eb050b68bafc9f1e63eb646
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-5.4.0-snapshot-1708254.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-5.4.0-snapshot-1708254.jar.sha1
new file mode 100644
index 00000000000..3d9bc8eb84b
--- /dev/null
+++ b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-5.4.0-snapshot-1708254.jar.sha1
@@ -0,0 +1 @@
+9e34274dd0f1903453f8e4f76ee8e88f15437752
diff --git a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-5.4.0-snapshot-1702855.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-5.4.0-snapshot-1702855.jar.sha1
deleted file mode 100644
index b135301e7db..00000000000
--- a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-5.4.0-snapshot-1702855.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-64b4db89ab7612284b5c685769c3550fb3018bbc
diff --git a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-5.4.0-snapshot-1708254.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-5.4.0-snapshot-1708254.jar.sha1
new file mode 100644
index 00000000000..730e93dae69
--- /dev/null
+++ b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-5.4.0-snapshot-1708254.jar.sha1
@@ -0,0 +1 @@
+8020f9e0a9c3f30fe1989dcac2085134385a9e93
diff --git a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-5.4.0-snapshot-1702855.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-5.4.0-snapshot-1702855.jar.sha1
deleted file mode 100644
index a32957d25e3..00000000000
--- a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-5.4.0-snapshot-1702855.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a79e5ed1671d9f511c5aff273ba287557f5f9103
diff --git a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-5.4.0-snapshot-1708254.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-5.4.0-snapshot-1708254.jar.sha1
new file mode 100644
index 00000000000..7b01fa0569c
--- /dev/null
+++ b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-5.4.0-snapshot-1708254.jar.sha1
@@ -0,0 +1 @@
+f8c9a0775dd92a2e537e0e19fc1831b3214eeef5
diff --git a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-5.4.0-snapshot-1702855.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-5.4.0-snapshot-1702855.jar.sha1
deleted file mode 100644
index 9421876bf2f..00000000000
--- a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-5.4.0-snapshot-1702855.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7b0b74aebbbfdd2175d6ce045fc538261e016417
diff --git a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-5.4.0-snapshot-1708254.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-5.4.0-snapshot-1708254.jar.sha1
new file mode 100644
index 00000000000..b24c486616a
--- /dev/null
+++ b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-5.4.0-snapshot-1708254.jar.sha1
@@ -0,0 +1 @@
+a3111a7cff126498ce361d56e363bcf8bee945a9
diff --git a/plugins/lang-expression/licenses/lucene-expressions-5.4.0-snapshot-1702855.jar.sha1 b/plugins/lang-expression/licenses/lucene-expressions-5.4.0-snapshot-1702855.jar.sha1
deleted file mode 100644
index d04bca5b6e4..00000000000
--- a/plugins/lang-expression/licenses/lucene-expressions-5.4.0-snapshot-1702855.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ecfb9a923b19fac61b4e9a79275f6bd242b1f091
diff --git a/plugins/lang-expression/licenses/lucene-expressions-5.4.0-snapshot-1708254.jar.sha1 b/plugins/lang-expression/licenses/lucene-expressions-5.4.0-snapshot-1708254.jar.sha1
new file mode 100644
index 00000000000..83d9a5e5c3b
--- /dev/null
+++ b/plugins/lang-expression/licenses/lucene-expressions-5.4.0-snapshot-1708254.jar.sha1
@@ -0,0 +1 @@
+40f4f54812a7a34312519ceb8b3f128feb4e2185
diff --git a/pom.xml b/pom.xml
index 86771979829..afc9db6d632 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,7 @@
 
         <!-- libraries -->
         <lucene.version>5.4.0</lucene.version>
-        <lucene.snapshot.revision>1702855</lucene.snapshot.revision>
+        <lucene.snapshot.revision>1708254</lucene.snapshot.revision>
         <lucene.maven.version>5.4.0-snapshot-${lucene.snapshot.revision}</lucene.maven.version>
         <testframework.version>2.1.17</testframework.version>
         <jackson.version>2.6.2</jackson.version>