diff --git a/core/src/main/resources/org/elasticsearch/bootstrap/security.policy b/core/src/main/resources/org/elasticsearch/bootstrap/security.policy
index e65886ad7933..e31c022f7f62 100644
--- a/core/src/main/resources/org/elasticsearch/bootstrap/security.policy
+++ b/core/src/main/resources/org/elasticsearch/bootstrap/security.policy
@@ -38,7 +38,7 @@ grant codeBase "${codebase.securesm-1.0.jar}" {
//// Very special jar permissions:
//// These are dangerous permissions that we don't want to grant to everything.
-grant codeBase "${codebase.lucene-core-5.4.0-snapshot-1710880.jar}" {
+grant codeBase "${codebase.lucene-core-5.4.0-snapshot-1711508.jar}" {
// needed to allow MMapDirectory's "unmap hack"
permission java.lang.RuntimePermission "accessClassInPackage.sun.misc";
permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
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 af60fcaf8532..e14943570308 100644
--- a/core/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy
+++ b/core/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy
@@ -30,7 +30,7 @@ grant codeBase "${codebase.securemock-1.1.jar}" {
permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
};
-grant codeBase "${codebase.lucene-test-framework-5.4.0-snapshot-1710880.jar}" {
+grant codeBase "${codebase.lucene-test-framework-5.4.0-snapshot-1711508.jar}" {
// needed by RamUsageTester
permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
};
diff --git a/distribution/licenses/lucene-analyzers-common-5.4.0-snapshot-1710880.jar.sha1 b/distribution/licenses/lucene-analyzers-common-5.4.0-snapshot-1710880.jar.sha1
deleted file mode 100644
index 1dff1091f025..000000000000
--- a/distribution/licenses/lucene-analyzers-common-5.4.0-snapshot-1710880.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-584673fa6187890af89deab81df6a8651651fa2a
diff --git a/distribution/licenses/lucene-analyzers-common-5.4.0-snapshot-1711508.jar.sha1 b/distribution/licenses/lucene-analyzers-common-5.4.0-snapshot-1711508.jar.sha1
new file mode 100644
index 000000000000..7ba588ce1187
--- /dev/null
+++ b/distribution/licenses/lucene-analyzers-common-5.4.0-snapshot-1711508.jar.sha1
@@ -0,0 +1 @@
+1ce5d6dab63f88bd997c2e465ec47efc2891ba5d
\ No newline at end of file
diff --git a/distribution/licenses/lucene-backward-codecs-5.4.0-snapshot-1710880.jar.sha1 b/distribution/licenses/lucene-backward-codecs-5.4.0-snapshot-1710880.jar.sha1
deleted file mode 100644
index f737f98bd2ab..000000000000
--- a/distribution/licenses/lucene-backward-codecs-5.4.0-snapshot-1710880.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f3b0911633d657e49d7a00df0eb5da5a7f65f61b
diff --git a/distribution/licenses/lucene-backward-codecs-5.4.0-snapshot-1711508.jar.sha1 b/distribution/licenses/lucene-backward-codecs-5.4.0-snapshot-1711508.jar.sha1
new file mode 100644
index 000000000000..f741492749df
--- /dev/null
+++ b/distribution/licenses/lucene-backward-codecs-5.4.0-snapshot-1711508.jar.sha1
@@ -0,0 +1 @@
+8640d74259f60aa4dada4912c9c3ebe772c9818e
\ No newline at end of file
diff --git a/distribution/licenses/lucene-core-5.4.0-snapshot-1710880.jar.sha1 b/distribution/licenses/lucene-core-5.4.0-snapshot-1710880.jar.sha1
deleted file mode 100644
index 89720a70e223..000000000000
--- a/distribution/licenses/lucene-core-5.4.0-snapshot-1710880.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d4ac9f13091eabf5cc0b13bd995dc2c161771139
diff --git a/distribution/licenses/lucene-core-5.4.0-snapshot-1711508.jar.sha1 b/distribution/licenses/lucene-core-5.4.0-snapshot-1711508.jar.sha1
new file mode 100644
index 000000000000..f48292917c5e
--- /dev/null
+++ b/distribution/licenses/lucene-core-5.4.0-snapshot-1711508.jar.sha1
@@ -0,0 +1 @@
+6641f07bcfd6a3d046b83e631e366b706f035c2e
\ No newline at end of file
diff --git a/distribution/licenses/lucene-grouping-5.4.0-snapshot-1710880.jar.sha1 b/distribution/licenses/lucene-grouping-5.4.0-snapshot-1710880.jar.sha1
deleted file mode 100644
index ac14c1412ed9..000000000000
--- a/distribution/licenses/lucene-grouping-5.4.0-snapshot-1710880.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9499d90d3db187210f9991ab0a92d48423ba3d4e
diff --git a/distribution/licenses/lucene-grouping-5.4.0-snapshot-1711508.jar.sha1 b/distribution/licenses/lucene-grouping-5.4.0-snapshot-1711508.jar.sha1
new file mode 100644
index 000000000000..856e03e684aa
--- /dev/null
+++ b/distribution/licenses/lucene-grouping-5.4.0-snapshot-1711508.jar.sha1
@@ -0,0 +1 @@
+b4e39e2b74aea6675b3c4717fa767b84f781d890
\ No newline at end of file
diff --git a/distribution/licenses/lucene-highlighter-5.4.0-snapshot-1710880.jar.sha1 b/distribution/licenses/lucene-highlighter-5.4.0-snapshot-1710880.jar.sha1
deleted file mode 100644
index d87ebcc05a1e..000000000000
--- a/distribution/licenses/lucene-highlighter-5.4.0-snapshot-1710880.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7daf49e720499e43d9b44b588526eb750ea2e83a
diff --git a/distribution/licenses/lucene-highlighter-5.4.0-snapshot-1711508.jar.sha1 b/distribution/licenses/lucene-highlighter-5.4.0-snapshot-1711508.jar.sha1
new file mode 100644
index 000000000000..b5626bee99ee
--- /dev/null
+++ b/distribution/licenses/lucene-highlighter-5.4.0-snapshot-1711508.jar.sha1
@@ -0,0 +1 @@
+92aaae41d7f2a7feaa821ce6ad02abc4f8734bc2
\ No newline at end of file
diff --git a/distribution/licenses/lucene-join-5.4.0-snapshot-1710880.jar.sha1 b/distribution/licenses/lucene-join-5.4.0-snapshot-1710880.jar.sha1
deleted file mode 100644
index 23b7f1816a56..000000000000
--- a/distribution/licenses/lucene-join-5.4.0-snapshot-1710880.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e1a36360e967bf3116a4271d4b04aa5bdcc235ca
diff --git a/distribution/licenses/lucene-join-5.4.0-snapshot-1711508.jar.sha1 b/distribution/licenses/lucene-join-5.4.0-snapshot-1711508.jar.sha1
new file mode 100644
index 000000000000..2dee65504ba1
--- /dev/null
+++ b/distribution/licenses/lucene-join-5.4.0-snapshot-1711508.jar.sha1
@@ -0,0 +1 @@
+e4c5402e04b4875bbe033077de9f6dea16418cb2
\ No newline at end of file
diff --git a/distribution/licenses/lucene-memory-5.4.0-snapshot-1710880.jar.sha1 b/distribution/licenses/lucene-memory-5.4.0-snapshot-1710880.jar.sha1
deleted file mode 100644
index e915f6a82016..000000000000
--- a/distribution/licenses/lucene-memory-5.4.0-snapshot-1710880.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-78b2fe81fe90c2d45ace3f21c7915319fe92119b
diff --git a/distribution/licenses/lucene-memory-5.4.0-snapshot-1711508.jar.sha1 b/distribution/licenses/lucene-memory-5.4.0-snapshot-1711508.jar.sha1
new file mode 100644
index 000000000000..d093ade101af
--- /dev/null
+++ b/distribution/licenses/lucene-memory-5.4.0-snapshot-1711508.jar.sha1
@@ -0,0 +1 @@
+9ead1255154fde92384e9f454999ad37e1261e3d
\ No newline at end of file
diff --git a/distribution/licenses/lucene-misc-5.4.0-snapshot-1710880.jar.sha1 b/distribution/licenses/lucene-misc-5.4.0-snapshot-1710880.jar.sha1
deleted file mode 100644
index 82ee83a33704..000000000000
--- a/distribution/licenses/lucene-misc-5.4.0-snapshot-1710880.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8c7734673fbdfa7ae251b29a7bee7842b6450606
diff --git a/distribution/licenses/lucene-misc-5.4.0-snapshot-1711508.jar.sha1 b/distribution/licenses/lucene-misc-5.4.0-snapshot-1711508.jar.sha1
new file mode 100644
index 000000000000..16d59356d363
--- /dev/null
+++ b/distribution/licenses/lucene-misc-5.4.0-snapshot-1711508.jar.sha1
@@ -0,0 +1 @@
+a03e432df9037631a5e9238822927ee4a2167d8d
\ No newline at end of file
diff --git a/distribution/licenses/lucene-queries-5.4.0-snapshot-1710880.jar.sha1 b/distribution/licenses/lucene-queries-5.4.0-snapshot-1710880.jar.sha1
deleted file mode 100644
index 54b54e2f168b..000000000000
--- a/distribution/licenses/lucene-queries-5.4.0-snapshot-1710880.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f2ce93847617b42c98fc44a979697ba8f6e3f693
diff --git a/distribution/licenses/lucene-queries-5.4.0-snapshot-1711508.jar.sha1 b/distribution/licenses/lucene-queries-5.4.0-snapshot-1711508.jar.sha1
new file mode 100644
index 000000000000..87503961b392
--- /dev/null
+++ b/distribution/licenses/lucene-queries-5.4.0-snapshot-1711508.jar.sha1
@@ -0,0 +1 @@
+159331ae15424664f70da76f1fb136c1e84ad095
\ No newline at end of file
diff --git a/distribution/licenses/lucene-queryparser-5.4.0-snapshot-1710880.jar.sha1 b/distribution/licenses/lucene-queryparser-5.4.0-snapshot-1710880.jar.sha1
deleted file mode 100644
index 96e3bac9f192..000000000000
--- a/distribution/licenses/lucene-queryparser-5.4.0-snapshot-1710880.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-bf99b0920e7d5cdddeddb0181ffad7df9e557ebb
diff --git a/distribution/licenses/lucene-queryparser-5.4.0-snapshot-1711508.jar.sha1 b/distribution/licenses/lucene-queryparser-5.4.0-snapshot-1711508.jar.sha1
new file mode 100644
index 000000000000..70e78527f21e
--- /dev/null
+++ b/distribution/licenses/lucene-queryparser-5.4.0-snapshot-1711508.jar.sha1
@@ -0,0 +1 @@
+9f6e02d1d54db4e7b39f2a9ff337285088ddb0e2
\ No newline at end of file
diff --git a/distribution/licenses/lucene-sandbox-5.4.0-snapshot-1710880.jar.sha1 b/distribution/licenses/lucene-sandbox-5.4.0-snapshot-1710880.jar.sha1
deleted file mode 100644
index 3e20f766ecec..000000000000
--- a/distribution/licenses/lucene-sandbox-5.4.0-snapshot-1710880.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-89cd7591008f10ceeb88fe87c52ea5f96754ad94
diff --git a/distribution/licenses/lucene-sandbox-5.4.0-snapshot-1711508.jar.sha1 b/distribution/licenses/lucene-sandbox-5.4.0-snapshot-1711508.jar.sha1
new file mode 100644
index 000000000000..4d551f223bb6
--- /dev/null
+++ b/distribution/licenses/lucene-sandbox-5.4.0-snapshot-1711508.jar.sha1
@@ -0,0 +1 @@
+f5e9fb1b996609e18ab7e4aae9ca9438ee66b437
\ No newline at end of file
diff --git a/distribution/licenses/lucene-spatial-5.4.0-snapshot-1710880.jar.sha1 b/distribution/licenses/lucene-spatial-5.4.0-snapshot-1710880.jar.sha1
deleted file mode 100644
index 3c7db1eac3bb..000000000000
--- a/distribution/licenses/lucene-spatial-5.4.0-snapshot-1710880.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-55817ab7fc4b2980429aa6ced151affe7740eb44
diff --git a/distribution/licenses/lucene-spatial-5.4.0-snapshot-1711508.jar.sha1 b/distribution/licenses/lucene-spatial-5.4.0-snapshot-1711508.jar.sha1
new file mode 100644
index 000000000000..d0b7d27d1624
--- /dev/null
+++ b/distribution/licenses/lucene-spatial-5.4.0-snapshot-1711508.jar.sha1
@@ -0,0 +1 @@
+c4d8c788084feceac969a2ecea547d42bf0b2715
\ No newline at end of file
diff --git a/distribution/licenses/lucene-spatial3d-5.4.0-snapshot-1710880.jar.sha1 b/distribution/licenses/lucene-spatial3d-5.4.0-snapshot-1710880.jar.sha1
deleted file mode 100644
index b933d7a64ef2..000000000000
--- a/distribution/licenses/lucene-spatial3d-5.4.0-snapshot-1710880.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ef817826ffec2b506672ba5038f4e396a7bfcdc7
diff --git a/distribution/licenses/lucene-spatial3d-5.4.0-snapshot-1711508.jar.sha1 b/distribution/licenses/lucene-spatial3d-5.4.0-snapshot-1711508.jar.sha1
new file mode 100644
index 000000000000..6a98328bb11a
--- /dev/null
+++ b/distribution/licenses/lucene-spatial3d-5.4.0-snapshot-1711508.jar.sha1
@@ -0,0 +1 @@
+04c4ead54ca6546ec7447f7f1916077c4767eb3d
\ No newline at end of file
diff --git a/distribution/licenses/lucene-suggest-5.4.0-snapshot-1710880.jar.sha1 b/distribution/licenses/lucene-suggest-5.4.0-snapshot-1710880.jar.sha1
deleted file mode 100644
index b448901cd517..000000000000
--- a/distribution/licenses/lucene-suggest-5.4.0-snapshot-1710880.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5b39ae55fa40709cc45d5925ad80d09cb0cdc4ba
diff --git a/distribution/licenses/lucene-suggest-5.4.0-snapshot-1711508.jar.sha1 b/distribution/licenses/lucene-suggest-5.4.0-snapshot-1711508.jar.sha1
new file mode 100644
index 000000000000..b6113edf88c4
--- /dev/null
+++ b/distribution/licenses/lucene-suggest-5.4.0-snapshot-1711508.jar.sha1
@@ -0,0 +1 @@
+10d9a389e44de137651d2c87ae401c9d29230bce
\ No newline at end of file
diff --git a/distribution/licenses/spatial4j-0.5-tests.jar.sha1 b/distribution/licenses/spatial4j-0.5-tests.jar.sha1
deleted file mode 100644
index 0c514f8835ef..000000000000
--- a/distribution/licenses/spatial4j-0.5-tests.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-bdcdf20a723516a233b5bcc0ca7d4decaa88b6ed
diff --git a/gradle.properties b/gradle.properties
index 58dc97027e9d..95510ac3653b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
group=org.elasticsearch
version=3.0.0-SNAPSHOT
-luceneVersion=5.4.0-snapshot-1710880
+luceneVersion=5.4.0-snapshot-1711508
diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-5.4.0-snapshot-1710880.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-5.4.0-snapshot-1710880.jar.sha1
deleted file mode 100644
index 25f0322e7556..000000000000
--- a/plugins/analysis-icu/licenses/lucene-analyzers-icu-5.4.0-snapshot-1710880.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-43979949bebc071fc0353513fffe11684690f23e
diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-5.4.0-snapshot-1711508.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-5.4.0-snapshot-1711508.jar.sha1
new file mode 100644
index 000000000000..8c09ac37be19
--- /dev/null
+++ b/plugins/analysis-icu/licenses/lucene-analyzers-icu-5.4.0-snapshot-1711508.jar.sha1
@@ -0,0 +1 @@
+8843675db98498fd858c071644238420cb8d270a
\ No newline at end of file
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-5.4.0-snapshot-1710880.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-5.4.0-snapshot-1710880.jar.sha1
deleted file mode 100644
index 973cab1d2d65..000000000000
--- a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-5.4.0-snapshot-1710880.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d621f00b5ce0f9fde87a713e932d888c3ddd1a78
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-5.4.0-snapshot-1711508.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-5.4.0-snapshot-1711508.jar.sha1
new file mode 100644
index 000000000000..ad36332c96c3
--- /dev/null
+++ b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-5.4.0-snapshot-1711508.jar.sha1
@@ -0,0 +1 @@
+b2a0b8143e660826b8605cf58de818a6ce423f47
\ No newline at end of file
diff --git a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-5.4.0-snapshot-1710880.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-5.4.0-snapshot-1710880.jar.sha1
deleted file mode 100644
index 8034c3c8fdce..000000000000
--- a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-5.4.0-snapshot-1710880.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d46a1cd06ae642581e566844b1e42e14e0eeffe6
diff --git a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-5.4.0-snapshot-1711508.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-5.4.0-snapshot-1711508.jar.sha1
new file mode 100644
index 000000000000..308e1edff4e1
--- /dev/null
+++ b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-5.4.0-snapshot-1711508.jar.sha1
@@ -0,0 +1 @@
+414bc537c247f07eb1b34ff943fc0ce4c80aab8c
\ No newline at end of file
diff --git a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-5.4.0-snapshot-1710880.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-5.4.0-snapshot-1710880.jar.sha1
deleted file mode 100644
index 3855bcfe7694..000000000000
--- a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-5.4.0-snapshot-1710880.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8e6058a95f38637c1d4b7a1ebcc6c8ce85c80b20
diff --git a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-5.4.0-snapshot-1711508.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-5.4.0-snapshot-1711508.jar.sha1
new file mode 100644
index 000000000000..96ca2605575d
--- /dev/null
+++ b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-5.4.0-snapshot-1711508.jar.sha1
@@ -0,0 +1 @@
+f2c2e3907a66825e042eb8f664f210d949f05108
\ No newline at end of file
diff --git a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-5.4.0-snapshot-1710880.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-5.4.0-snapshot-1710880.jar.sha1
deleted file mode 100644
index c1e15a2e8326..000000000000
--- a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-5.4.0-snapshot-1710880.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4c69ca398b34c7a58482b09cdc06d0e2bab89cc4
diff --git a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-5.4.0-snapshot-1711508.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-5.4.0-snapshot-1711508.jar.sha1
new file mode 100644
index 000000000000..98240f9b732b
--- /dev/null
+++ b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-5.4.0-snapshot-1711508.jar.sha1
@@ -0,0 +1 @@
+7059da88bf88df123c62d917aeed4c144d62665f
\ No newline at end of file
diff --git a/plugins/lang-expression/licenses/lucene-expressions-5.4.0-snapshot-1710880.jar.sha1 b/plugins/lang-expression/licenses/lucene-expressions-5.4.0-snapshot-1710880.jar.sha1
deleted file mode 100644
index 6f2d485fdb1c..000000000000
--- a/plugins/lang-expression/licenses/lucene-expressions-5.4.0-snapshot-1710880.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-431504b7bad8ffc1a03707b9a1531d95f33e10b9
diff --git a/plugins/lang-expression/licenses/lucene-expressions-5.4.0-snapshot-1711508.jar.sha1 b/plugins/lang-expression/licenses/lucene-expressions-5.4.0-snapshot-1711508.jar.sha1
new file mode 100644
index 000000000000..7ac4891745d0
--- /dev/null
+++ b/plugins/lang-expression/licenses/lucene-expressions-5.4.0-snapshot-1711508.jar.sha1
@@ -0,0 +1 @@
+627b73ddbbbd03746123751b36a674d81308a046
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 9cb61ca1a889..32425a87502b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,7 @@
5.4.0
- 1710880
+ 1711159
5.4.0-snapshot-${lucene.snapshot.revision}
2.2.0
1.1