diff --git a/core/src/main/java/org/elasticsearch/common/lucene/Lucene.java b/core/src/main/java/org/elasticsearch/common/lucene/Lucene.java
index 25c0743b938..16a9796d8b6 100644
--- a/core/src/main/java/org/elasticsearch/common/lucene/Lucene.java
+++ b/core/src/main/java/org/elasticsearch/common/lucene/Lucene.java
@@ -60,9 +60,9 @@ public class Lucene {
     public static final Version VERSION = Version.LATEST;
     public static final Version ANALYZER_VERSION = VERSION;
     public static final Version QUERYPARSER_VERSION = VERSION;
-    public static final String LATEST_DOC_VALUES_FORMAT = "Lucene50";
+    public static final String LATEST_DOC_VALUES_FORMAT = "Lucene54";
     public static final String LATEST_POSTINGS_FORMAT = "Lucene50";
-    public static final String LATEST_CODEC = "Lucene53";
+    public static final String LATEST_CODEC = "Lucene54";
 
     static {
         Deprecated annotation = PostingsFormat.forName(LATEST_POSTINGS_FORMAT).getClass().getAnnotation(Deprecated.class);
diff --git a/core/src/main/java/org/elasticsearch/index/codec/CodecService.java b/core/src/main/java/org/elasticsearch/index/codec/CodecService.java
index 9a15d853eda..f7c53cf20f0 100644
--- a/core/src/main/java/org/elasticsearch/index/codec/CodecService.java
+++ b/core/src/main/java/org/elasticsearch/index/codec/CodecService.java
@@ -21,7 +21,7 @@ package org.elasticsearch.index.codec;
 
 import org.apache.lucene.codecs.Codec;
 import org.apache.lucene.codecs.lucene50.Lucene50StoredFieldsFormat.Mode;
-import org.apache.lucene.codecs.lucene53.Lucene53Codec;
+import org.apache.lucene.codecs.lucene54.Lucene54Codec;
 import org.elasticsearch.common.collect.MapBuilder;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.settings.Settings;
@@ -56,8 +56,8 @@ public class CodecService extends AbstractIndexComponent {
         this.mapperService = mapperService;
         MapBuilder<String, Codec> codecs = MapBuilder.<String, Codec>newMapBuilder();
         if (mapperService == null) {
-            codecs.put(DEFAULT_CODEC, new Lucene53Codec());
-            codecs.put(BEST_COMPRESSION_CODEC, new Lucene53Codec(Mode.BEST_COMPRESSION));
+            codecs.put(DEFAULT_CODEC, new Lucene54Codec());
+            codecs.put(BEST_COMPRESSION_CODEC, new Lucene54Codec(Mode.BEST_COMPRESSION));
         } else {
             codecs.put(DEFAULT_CODEC,
                     new PerFieldMappingPostingFormatCodec(Mode.BEST_SPEED, mapperService, logger));
diff --git a/core/src/main/java/org/elasticsearch/index/codec/PerFieldMappingPostingFormatCodec.java b/core/src/main/java/org/elasticsearch/index/codec/PerFieldMappingPostingFormatCodec.java
index b8e44bdadb6..b504c4c21c5 100644
--- a/core/src/main/java/org/elasticsearch/index/codec/PerFieldMappingPostingFormatCodec.java
+++ b/core/src/main/java/org/elasticsearch/index/codec/PerFieldMappingPostingFormatCodec.java
@@ -22,7 +22,7 @@ package org.elasticsearch.index.codec;
 import org.apache.lucene.codecs.Codec;
 import org.apache.lucene.codecs.PostingsFormat;
 import org.apache.lucene.codecs.lucene50.Lucene50StoredFieldsFormat;
-import org.apache.lucene.codecs.lucene53.Lucene53Codec;
+import org.apache.lucene.codecs.lucene54.Lucene54Codec;
 import org.elasticsearch.common.logging.ESLogger;
 import org.elasticsearch.common.lucene.Lucene;
 import org.elasticsearch.index.mapper.MappedFieldType;
@@ -38,7 +38,7 @@ import org.elasticsearch.index.mapper.core.CompletionFieldMapper;
  * configured for a specific field the default postings format is used.
  */
 // LUCENE UPGRADE: make sure to move to a new codec depending on the lucene version
-public class PerFieldMappingPostingFormatCodec extends Lucene53Codec {
+public class PerFieldMappingPostingFormatCodec extends Lucene54Codec {
     private final ESLogger logger;
     private final MapperService mapperService;
 
diff --git a/core/src/main/resources/org/elasticsearch/bootstrap/security.policy b/core/src/main/resources/org/elasticsearch/bootstrap/security.policy
index 244d5be6511..100afb59ef5 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 "file:${{java.ext.dirs}}/*" {
 //// 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-1708254.jar}" {
+grant codeBase "${codebase.lucene-core-5.4.0-snapshot-1710880.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 f038c51c596..345943a47ec 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-1708254.jar}" {
+grant codeBase "${codebase.lucene-test-framework-5.4.0-snapshot-1710880.jar}" {
   // needed by RamUsageTester
   permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
 };
diff --git a/core/src/test/java/org/elasticsearch/index/codec/CodecTests.java b/core/src/test/java/org/elasticsearch/index/codec/CodecTests.java
index 570ea3551fe..5d6f83b2d47 100644
--- a/core/src/test/java/org/elasticsearch/index/codec/CodecTests.java
+++ b/core/src/test/java/org/elasticsearch/index/codec/CodecTests.java
@@ -31,6 +31,7 @@ import org.apache.lucene.codecs.lucene50.Lucene50Codec;
 import org.apache.lucene.codecs.lucene50.Lucene50StoredFieldsFormat;
 import org.apache.lucene.codecs.lucene50.Lucene50StoredFieldsFormat.Mode;
 import org.apache.lucene.codecs.lucene53.Lucene53Codec;
+import org.apache.lucene.codecs.lucene54.Lucene54Codec;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.index.DirectoryReader;
 import org.apache.lucene.index.IndexWriter;
@@ -49,7 +50,8 @@ public class CodecTests extends ESSingleNodeTestCase {
     public void testResolveDefaultCodecs() throws Exception {
         CodecService codecService = createCodecService();
         assertThat(codecService.codec("default"), instanceOf(PerFieldMappingPostingFormatCodec.class));
-        assertThat(codecService.codec("default"), instanceOf(Lucene53Codec.class));
+        assertThat(codecService.codec("default"), instanceOf(Lucene54Codec.class));
+        assertThat(codecService.codec("Lucene53"), instanceOf(Lucene53Codec.class));
         assertThat(codecService.codec("Lucene50"), instanceOf(Lucene50Codec.class));
         assertThat(codecService.codec("Lucene410"), instanceOf(Lucene410Codec.class));
         assertThat(codecService.codec("Lucene49"), instanceOf(Lucene49Codec.class));
diff --git a/core/src/test/java/org/elasticsearch/index/store/StoreTests.java b/core/src/test/java/org/elasticsearch/index/store/StoreTests.java
index ef19eeee2f3..557ea1d9239 100644
--- a/core/src/test/java/org/elasticsearch/index/store/StoreTests.java
+++ b/core/src/test/java/org/elasticsearch/index/store/StoreTests.java
@@ -23,7 +23,7 @@ import org.apache.lucene.codecs.CodecUtil;
 import org.apache.lucene.codecs.FilterCodec;
 import org.apache.lucene.codecs.SegmentInfoFormat;
 import org.apache.lucene.codecs.lucene50.Lucene50SegmentInfoFormat;
-import org.apache.lucene.codecs.lucene53.Lucene53Codec;
+import org.apache.lucene.codecs.lucene54.Lucene54Codec;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
 import org.apache.lucene.document.SortedDocValuesField;
@@ -290,7 +290,7 @@ public class StoreTests extends ESTestCase {
     private static final class OldSIMockingCodec extends FilterCodec {
 
         protected OldSIMockingCodec() {
-            super(new Lucene53Codec().getName(), new Lucene53Codec());
+            super(new Lucene54Codec().getName(), new Lucene54Codec());
         }
 
         @Override
diff --git a/core/src/test/java/org/elasticsearch/search/suggest/completion/CompletionPostingsFormatTests.java b/core/src/test/java/org/elasticsearch/search/suggest/completion/CompletionPostingsFormatTests.java
index 9e3043dc624..4fbde2d9058 100644
--- a/core/src/test/java/org/elasticsearch/search/suggest/completion/CompletionPostingsFormatTests.java
+++ b/core/src/test/java/org/elasticsearch/search/suggest/completion/CompletionPostingsFormatTests.java
@@ -23,7 +23,7 @@ import org.apache.lucene.analysis.standard.StandardAnalyzer;
 import org.apache.lucene.codecs.Codec;
 import org.apache.lucene.codecs.FieldsConsumer;
 import org.apache.lucene.codecs.PostingsFormat;
-import org.apache.lucene.codecs.lucene53.Lucene53Codec;
+import org.apache.lucene.codecs.lucene54.Lucene54Codec;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.index.DirectoryReader;
 import org.apache.lucene.index.Fields;
@@ -272,7 +272,7 @@ public class CompletionPostingsFormatTests extends ESTestCase {
     public Lookup buildAnalyzingLookup(final CompletionFieldMapper mapper, String[] terms, String[] surfaces, long[] weights)
             throws IOException {
         RAMDirectory dir = new RAMDirectory();
-        Codec codec = new Lucene53Codec() {
+        Codec codec = new Lucene54Codec() {
             @Override
             public PostingsFormat getPostingsFormatForField(String field) {
                 final PostingsFormat in = super.getPostingsFormatForField(field);
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
deleted file mode 100644
index 70aab5b26fb..00000000000
--- a/distribution/licenses/lucene-analyzers-common-5.4.0-snapshot-1708254.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-16aa0bdb66b7471e9a26f78a9a5701f678a905db
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
new file mode 100644
index 00000000000..1dff1091f02
--- /dev/null
+++ b/distribution/licenses/lucene-analyzers-common-5.4.0-snapshot-1710880.jar.sha1
@@ -0,0 +1 @@
+584673fa6187890af89deab81df6a8651651fa2a
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
deleted file mode 100644
index 49444103062..00000000000
--- a/distribution/licenses/lucene-backward-codecs-5.4.0-snapshot-1708254.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7f16ec8294a09118237817d8c9c03b87cec67e29
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
new file mode 100644
index 00000000000..f737f98bd2a
--- /dev/null
+++ b/distribution/licenses/lucene-backward-codecs-5.4.0-snapshot-1710880.jar.sha1
@@ -0,0 +1 @@
+f3b0911633d657e49d7a00df0eb5da5a7f65f61b
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
deleted file mode 100644
index 237fe0d2597..00000000000
--- a/distribution/licenses/lucene-core-5.4.0-snapshot-1708254.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0a2305ed749cb8abc321ee50b871097b4bda8a64
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
new file mode 100644
index 00000000000..89720a70e22
--- /dev/null
+++ b/distribution/licenses/lucene-core-5.4.0-snapshot-1710880.jar.sha1
@@ -0,0 +1 @@
+d4ac9f13091eabf5cc0b13bd995dc2c161771139
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
deleted file mode 100644
index 9f42b06abd6..00000000000
--- a/distribution/licenses/lucene-grouping-5.4.0-snapshot-1708254.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-51ed4b60eddd2ce38fcdc8c89903c1ece336ab4f
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
new file mode 100644
index 00000000000..ac14c1412ed
--- /dev/null
+++ b/distribution/licenses/lucene-grouping-5.4.0-snapshot-1710880.jar.sha1
@@ -0,0 +1 @@
+9499d90d3db187210f9991ab0a92d48423ba3d4e
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
deleted file mode 100644
index 164bfa24035..00000000000
--- a/distribution/licenses/lucene-highlighter-5.4.0-snapshot-1708254.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d71c018d888dc5fe71c7fb20c2a6009c36ef117f
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
new file mode 100644
index 00000000000..d87ebcc05a1
--- /dev/null
+++ b/distribution/licenses/lucene-highlighter-5.4.0-snapshot-1710880.jar.sha1
@@ -0,0 +1 @@
+7daf49e720499e43d9b44b588526eb750ea2e83a
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
deleted file mode 100644
index 029fd0523d9..00000000000
--- a/distribution/licenses/lucene-join-5.4.0-snapshot-1708254.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5e82bc11bccb55af5d88d5526abe9bd3d04f0d13
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
new file mode 100644
index 00000000000..23b7f1816a5
--- /dev/null
+++ b/distribution/licenses/lucene-join-5.4.0-snapshot-1710880.jar.sha1
@@ -0,0 +1 @@
+e1a36360e967bf3116a4271d4b04aa5bdcc235ca
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
deleted file mode 100644
index 26f5148a59e..00000000000
--- a/distribution/licenses/lucene-memory-5.4.0-snapshot-1708254.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0dfec35d41e7120e48cf6d0ae16a88ef2949e778
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
new file mode 100644
index 00000000000..e915f6a8201
--- /dev/null
+++ b/distribution/licenses/lucene-memory-5.4.0-snapshot-1710880.jar.sha1
@@ -0,0 +1 @@
+78b2fe81fe90c2d45ace3f21c7915319fe92119b
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
deleted file mode 100644
index 004205b8f61..00000000000
--- a/distribution/licenses/lucene-misc-5.4.0-snapshot-1708254.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-30ddb3175c08d443c5a9f74e50e50e3a95afa72d
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
new file mode 100644
index 00000000000..82ee83a3370
--- /dev/null
+++ b/distribution/licenses/lucene-misc-5.4.0-snapshot-1710880.jar.sha1
@@ -0,0 +1 @@
+8c7734673fbdfa7ae251b29a7bee7842b6450606
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
deleted file mode 100644
index 8ae9588eaf6..00000000000
--- a/distribution/licenses/lucene-queries-5.4.0-snapshot-1708254.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5e45b31ff8374ac5dc651ac2477dde5299b7e746
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
new file mode 100644
index 00000000000..54b54e2f168
--- /dev/null
+++ b/distribution/licenses/lucene-queries-5.4.0-snapshot-1710880.jar.sha1
@@ -0,0 +1 @@
+f2ce93847617b42c98fc44a979697ba8f6e3f693
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
deleted file mode 100644
index e6fd31e99fa..00000000000
--- a/distribution/licenses/lucene-queryparser-5.4.0-snapshot-1708254.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ff0780a5ad9620036f80114b2ce0b30d25647a62
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
new file mode 100644
index 00000000000..96e3bac9f19
--- /dev/null
+++ b/distribution/licenses/lucene-queryparser-5.4.0-snapshot-1710880.jar.sha1
@@ -0,0 +1 @@
+bf99b0920e7d5cdddeddb0181ffad7df9e557ebb
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
deleted file mode 100644
index e687bd7dca0..00000000000
--- a/distribution/licenses/lucene-sandbox-5.4.0-snapshot-1708254.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7679111888ccd185db0b360954777e68364eb88a
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
new file mode 100644
index 00000000000..3e20f766ece
--- /dev/null
+++ b/distribution/licenses/lucene-sandbox-5.4.0-snapshot-1710880.jar.sha1
@@ -0,0 +1 @@
+89cd7591008f10ceeb88fe87c52ea5f96754ad94
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
deleted file mode 100644
index a649c94eea7..00000000000
--- a/distribution/licenses/lucene-spatial-5.4.0-snapshot-1708254.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a1699a0ed320c4db66ae4e8dc9dfd80e4bfc4017
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
new file mode 100644
index 00000000000..3c7db1eac3b
--- /dev/null
+++ b/distribution/licenses/lucene-spatial-5.4.0-snapshot-1710880.jar.sha1
@@ -0,0 +1 @@
+55817ab7fc4b2980429aa6ced151affe7740eb44
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
deleted file mode 100644
index c7f799d4b62..00000000000
--- a/distribution/licenses/lucene-spatial3d-5.4.0-snapshot-1708254.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7bcd15e2e685a8c92f48c3d2f355d2dd63073420
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
new file mode 100644
index 00000000000..b933d7a64ef
--- /dev/null
+++ b/distribution/licenses/lucene-spatial3d-5.4.0-snapshot-1710880.jar.sha1
@@ -0,0 +1 @@
+ef817826ffec2b506672ba5038f4e396a7bfcdc7
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
deleted file mode 100644
index 3382df6a549..00000000000
--- a/distribution/licenses/lucene-suggest-5.4.0-snapshot-1708254.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-be74ad2360527cca776379499254f355ccd93484
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
new file mode 100644
index 00000000000..b448901cd51
--- /dev/null
+++ b/distribution/licenses/lucene-suggest-5.4.0-snapshot-1710880.jar.sha1
@@ -0,0 +1 @@
+5b39ae55fa40709cc45d5925ad80d09cb0cdc4ba
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
deleted file mode 100644
index 53f66772d49..00000000000
--- a/plugins/analysis-icu/licenses/lucene-analyzers-icu-5.4.0-snapshot-1708254.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0ffcda4683ae66ecb96882a6809516d9a288ba52
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
new file mode 100644
index 00000000000..25f0322e755
--- /dev/null
+++ b/plugins/analysis-icu/licenses/lucene-analyzers-icu-5.4.0-snapshot-1710880.jar.sha1
@@ -0,0 +1 @@
+43979949bebc071fc0353513fffe11684690f23e
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
deleted file mode 100644
index 3d9bc8eb84b..00000000000
--- a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-5.4.0-snapshot-1708254.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9e34274dd0f1903453f8e4f76ee8e88f15437752
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
new file mode 100644
index 00000000000..973cab1d2d6
--- /dev/null
+++ b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-5.4.0-snapshot-1710880.jar.sha1
@@ -0,0 +1 @@
+d621f00b5ce0f9fde87a713e932d888c3ddd1a78
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
deleted file mode 100644
index 730e93dae69..00000000000
--- a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-5.4.0-snapshot-1708254.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8020f9e0a9c3f30fe1989dcac2085134385a9e93
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
new file mode 100644
index 00000000000..8034c3c8fdc
--- /dev/null
+++ b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-5.4.0-snapshot-1710880.jar.sha1
@@ -0,0 +1 @@
+d46a1cd06ae642581e566844b1e42e14e0eeffe6
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
deleted file mode 100644
index 7b01fa0569c..00000000000
--- a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-5.4.0-snapshot-1708254.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f8c9a0775dd92a2e537e0e19fc1831b3214eeef5
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
new file mode 100644
index 00000000000..3855bcfe769
--- /dev/null
+++ b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-5.4.0-snapshot-1710880.jar.sha1
@@ -0,0 +1 @@
+8e6058a95f38637c1d4b7a1ebcc6c8ce85c80b20
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
deleted file mode 100644
index b24c486616a..00000000000
--- a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-5.4.0-snapshot-1708254.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a3111a7cff126498ce361d56e363bcf8bee945a9
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
new file mode 100644
index 00000000000..c1e15a2e832
--- /dev/null
+++ b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-5.4.0-snapshot-1710880.jar.sha1
@@ -0,0 +1 @@
+4c69ca398b34c7a58482b09cdc06d0e2bab89cc4
diff --git a/plugins/lang-expression/licenses/antlr4-runtime-4.5.1-1.jar.sha1 b/plugins/lang-expression/licenses/antlr4-runtime-4.5.1-1.jar.sha1
new file mode 100644
index 00000000000..f15e50069ba
--- /dev/null
+++ b/plugins/lang-expression/licenses/antlr4-runtime-4.5.1-1.jar.sha1
@@ -0,0 +1 @@
+66144204f9d6d7d3f3f775622c2dd7e9bd511d97
diff --git a/plugins/lang-expression/licenses/antlr4-runtime-4.5.jar.sha1 b/plugins/lang-expression/licenses/antlr4-runtime-4.5.jar.sha1
deleted file mode 100644
index 5299c19c73b..00000000000
--- a/plugins/lang-expression/licenses/antlr4-runtime-4.5.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-29e48af049f17dd89153b83a7ad5d01b3b4bcdda
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
deleted file mode 100644
index 83d9a5e5c3b..00000000000
--- a/plugins/lang-expression/licenses/lucene-expressions-5.4.0-snapshot-1708254.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-40f4f54812a7a34312519ceb8b3f128feb4e2185
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
new file mode 100644
index 00000000000..6f2d485fdb1
--- /dev/null
+++ b/plugins/lang-expression/licenses/lucene-expressions-5.4.0-snapshot-1710880.jar.sha1
@@ -0,0 +1 @@
+431504b7bad8ffc1a03707b9a1531d95f33e10b9
diff --git a/pom.xml b/pom.xml
index 797da574925..72e89b98758 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,7 @@
         <!-- NOTE: when changing these versions, also update security.policy and test-framework.policy to match -->
         <!-- (we don't do any automatic property substitution on those resources, it could get confusing...     -->
         <lucene.version>5.4.0</lucene.version>
-        <lucene.snapshot.revision>1708254</lucene.snapshot.revision>
+        <lucene.snapshot.revision>1710880</lucene.snapshot.revision>
         <lucene.maven.version>5.4.0-snapshot-${lucene.snapshot.revision}</lucene.maven.version>
         <testframework.version>2.1.17</testframework.version>
         <securemock.version>1.1</securemock.version>