diff --git a/buildSrc/version.properties b/buildSrc/version.properties
index 0f3e6c62c9b75..1559038aef486 100644
--- a/buildSrc/version.properties
+++ b/buildSrc/version.properties
@@ -1,5 +1,5 @@
 elasticsearch     = 7.0.0-alpha1
-lucene            = 7.3.0
+lucene            = 7.4.0-snapshot-1ed95c097b
 
 # optional dependencies
 spatial4j         = 0.7
diff --git a/docs/Versions.asciidoc b/docs/Versions.asciidoc
index 9f7fdc9ea2f17..608d5b9288e6e 100644
--- a/docs/Versions.asciidoc
+++ b/docs/Versions.asciidoc
@@ -1,7 +1,7 @@
 :version:               7.0.0-alpha1
 :major-version:         7.x
-:lucene_version:        7.3.0
-:lucene_version_path:   7_3_0
+:lucene_version:        7.4.0
+:lucene_version_path:   7_4_0
 :branch:                master
 :jdk:                   1.8.0_131
 :jdk_major:             8
diff --git a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/CommonAnalysisFactoryTests.java b/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/CommonAnalysisFactoryTests.java
index 5113f8a6eb492..befd26296a5c8 100644
--- a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/CommonAnalysisFactoryTests.java
+++ b/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/CommonAnalysisFactoryTests.java
@@ -130,6 +130,8 @@ protected Map<String, Class<?>> getTokenFilters() {
         filters.put("brazilianstem", BrazilianStemTokenFilterFactory.class);
         filters.put("czechstem", CzechStemTokenFilterFactory.class);
         filters.put("germanstem", GermanStemTokenFilterFactory.class);
+        // this filter is not exposed and should only be used internally
+        filters.put("fixedshingle", Void.class);
         return filters;
     }
 
diff --git a/modules/lang-expression/licenses/lucene-expressions-7.3.0.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-7.3.0.jar.sha1
deleted file mode 100644
index 62a094a8b0feb..0000000000000
--- a/modules/lang-expression/licenses/lucene-expressions-7.3.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-cb82d9db3043bbd25b4d0eb5022ed1e529c936d3
\ No newline at end of file
diff --git a/modules/lang-expression/licenses/lucene-expressions-7.4.0-snapshot-1ed95c097b.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-7.4.0-snapshot-1ed95c097b.jar.sha1
new file mode 100644
index 0000000000000..8303f69b87d7b
--- /dev/null
+++ b/modules/lang-expression/licenses/lucene-expressions-7.4.0-snapshot-1ed95c097b.jar.sha1
@@ -0,0 +1 @@
+63ff4af3504881744695f6239fcb3e9c0e3240b1
\ No newline at end of file
diff --git a/plugins/analysis-icu/build.gradle b/plugins/analysis-icu/build.gradle
index 123db9fc4a575..4d6f9310cdd03 100644
--- a/plugins/analysis-icu/build.gradle
+++ b/plugins/analysis-icu/build.gradle
@@ -30,7 +30,7 @@ forbiddenApis {
 
 dependencies {
   compile "org.apache.lucene:lucene-analyzers-icu:${versions.lucene}"
-  compile 'com.ibm.icu:icu4j:59.1'
+  compile 'com.ibm.icu:icu4j:61.1'
 }
 
 dependencyLicenses {
diff --git a/plugins/analysis-icu/licenses/icu4j-59.1.jar.sha1 b/plugins/analysis-icu/licenses/icu4j-59.1.jar.sha1
deleted file mode 100644
index 5401f914f5853..0000000000000
--- a/plugins/analysis-icu/licenses/icu4j-59.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6f06e820cf4c8968bbbaae66ae0b33f6a256b57f
\ No newline at end of file
diff --git a/plugins/analysis-icu/licenses/icu4j-61.1.jar.sha1 b/plugins/analysis-icu/licenses/icu4j-61.1.jar.sha1
new file mode 100644
index 0000000000000..7b7fcfe1c794b
--- /dev/null
+++ b/plugins/analysis-icu/licenses/icu4j-61.1.jar.sha1
@@ -0,0 +1 @@
+28d33b5e44e72edcc66a5da7a34a42147f38d987
\ No newline at end of file
diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.3.0.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.3.0.jar.sha1
deleted file mode 100644
index de70972e975f0..0000000000000
--- a/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.3.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c09216a18658d5b2912566efff8665e45edc24b4
\ No newline at end of file
diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.4.0-snapshot-1ed95c097b.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.4.0-snapshot-1ed95c097b.jar.sha1
new file mode 100644
index 0000000000000..efcbe94ca1857
--- /dev/null
+++ b/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.4.0-snapshot-1ed95c097b.jar.sha1
@@ -0,0 +1 @@
+5f3c053ef858c58c74a687a40f5451d19b69850b
\ No newline at end of file
diff --git a/plugins/analysis-icu/src/main/java/org/elasticsearch/index/analysis/IcuTokenizerFactory.java b/plugins/analysis-icu/src/main/java/org/elasticsearch/index/analysis/IcuTokenizerFactory.java
index fa1999cf17e39..84c611c0f8132 100644
--- a/plugins/analysis-icu/src/main/java/org/elasticsearch/index/analysis/IcuTokenizerFactory.java
+++ b/plugins/analysis-icu/src/main/java/org/elasticsearch/index/analysis/IcuTokenizerFactory.java
@@ -89,9 +89,9 @@ private ICUTokenizerConfig getIcuConfig(Environment env, Settings settings) {
                 // cjkAsWords nor myanmarAsWords are not configurable yet.
                 ICUTokenizerConfig config = new DefaultICUTokenizerConfig(true, true) {
                     @Override
-                    public BreakIterator getBreakIterator(int script) {
+                    public RuleBasedBreakIterator getBreakIterator(int script) {
                         if (breakers[script] != null) {
-                            return (BreakIterator) breakers[script].clone();
+                            return (RuleBasedBreakIterator) breakers[script].clone();
                         } else {
                             return super.getBreakIterator(script);
                         }
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.3.0.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.3.0.jar.sha1
deleted file mode 100644
index 40ff3efe2642c..0000000000000
--- a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.3.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c9d5bbd0affa90b46e173c762c35419a54977c35
\ No newline at end of file
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.4.0-snapshot-1ed95c097b.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.4.0-snapshot-1ed95c097b.jar.sha1
new file mode 100644
index 0000000000000..04f81d14df090
--- /dev/null
+++ b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.4.0-snapshot-1ed95c097b.jar.sha1
@@ -0,0 +1 @@
+a6e72085f7c2ade43ec0e5f52c227e6f715666ad
\ No newline at end of file
diff --git a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.3.0.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.3.0.jar.sha1
deleted file mode 100644
index 9442635addda9..0000000000000
--- a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.3.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4e6c63fa8ae005d81d12f0d88ffa98346b443ac4
\ No newline at end of file
diff --git a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.4.0-snapshot-1ed95c097b.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.4.0-snapshot-1ed95c097b.jar.sha1
new file mode 100644
index 0000000000000..76728498136c7
--- /dev/null
+++ b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.4.0-snapshot-1ed95c097b.jar.sha1
@@ -0,0 +1 @@
+25c93466d0a2c41df0cf98de77d632f3f02fa98d
\ No newline at end of file
diff --git a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.3.0.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.3.0.jar.sha1
deleted file mode 100644
index 780824c4d4558..0000000000000
--- a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.3.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-37b7ff0a6493f139cb77f5bda965ac0189c8efd1
\ No newline at end of file
diff --git a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.4.0-snapshot-1ed95c097b.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.4.0-snapshot-1ed95c097b.jar.sha1
new file mode 100644
index 0000000000000..509f08ed31072
--- /dev/null
+++ b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.4.0-snapshot-1ed95c097b.jar.sha1
@@ -0,0 +1 @@
+4688aaa48607ac26f6bf2567052019ab3fb2ff5e
\ No newline at end of file
diff --git a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.3.0.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.3.0.jar.sha1
deleted file mode 100644
index ba241e6a09915..0000000000000
--- a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.3.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d189185da23b2221c4d532da5e2cacce735f8a0c
\ No newline at end of file
diff --git a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.4.0-snapshot-1ed95c097b.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.4.0-snapshot-1ed95c097b.jar.sha1
new file mode 100644
index 0000000000000..a6dc434b03ac9
--- /dev/null
+++ b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.4.0-snapshot-1ed95c097b.jar.sha1
@@ -0,0 +1 @@
+ad71de632c9363c3f200cd5a240686256c7db431
\ No newline at end of file
diff --git a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.3.0.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.3.0.jar.sha1
deleted file mode 100644
index fb7e5befe4774..0000000000000
--- a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.3.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-74462b51de45afe708f1042cc901fe7370413871
\ No newline at end of file
diff --git a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.4.0-snapshot-1ed95c097b.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.4.0-snapshot-1ed95c097b.jar.sha1
new file mode 100644
index 0000000000000..967957ac0ff97
--- /dev/null
+++ b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.4.0-snapshot-1ed95c097b.jar.sha1
@@ -0,0 +1 @@
+96a630a7c4916358f129f6bac8718108811efe1a
\ No newline at end of file
diff --git a/server/licenses/lucene-analyzers-common-7.3.0.jar.sha1 b/server/licenses/lucene-analyzers-common-7.3.0.jar.sha1
deleted file mode 100644
index 5a50f9dd77f5e..0000000000000
--- a/server/licenses/lucene-analyzers-common-7.3.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4325a5cdf8d3fa23f326cd86a2297fee2bc844f5
\ No newline at end of file
diff --git a/server/licenses/lucene-analyzers-common-7.4.0-snapshot-1ed95c097b.jar.sha1 b/server/licenses/lucene-analyzers-common-7.4.0-snapshot-1ed95c097b.jar.sha1
new file mode 100644
index 0000000000000..ad3125768abcd
--- /dev/null
+++ b/server/licenses/lucene-analyzers-common-7.4.0-snapshot-1ed95c097b.jar.sha1
@@ -0,0 +1 @@
+2b2be48f6622c150496e755497e7bdb8daa46030
\ No newline at end of file
diff --git a/server/licenses/lucene-backward-codecs-7.3.0.jar.sha1 b/server/licenses/lucene-backward-codecs-7.3.0.jar.sha1
deleted file mode 100644
index 309f301ad8c81..0000000000000
--- a/server/licenses/lucene-backward-codecs-7.3.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3b618a21a924cb35ac1f27d3ca47d9ed04f43588
\ No newline at end of file
diff --git a/server/licenses/lucene-backward-codecs-7.4.0-snapshot-1ed95c097b.jar.sha1 b/server/licenses/lucene-backward-codecs-7.4.0-snapshot-1ed95c097b.jar.sha1
new file mode 100644
index 0000000000000..083cc9b1e3911
--- /dev/null
+++ b/server/licenses/lucene-backward-codecs-7.4.0-snapshot-1ed95c097b.jar.sha1
@@ -0,0 +1 @@
+6cbafc48e8ac4966377665eb3bbe93f9addf04a5
\ No newline at end of file
diff --git a/server/licenses/lucene-core-7.3.0.jar.sha1 b/server/licenses/lucene-core-7.3.0.jar.sha1
deleted file mode 100644
index e12c932b38dd0..0000000000000
--- a/server/licenses/lucene-core-7.3.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-040e2de30c5e6bad868b144e371730200719ceb3
\ No newline at end of file
diff --git a/server/licenses/lucene-core-7.4.0-snapshot-1ed95c097b.jar.sha1 b/server/licenses/lucene-core-7.4.0-snapshot-1ed95c097b.jar.sha1
new file mode 100644
index 0000000000000..20da7d0f78e9d
--- /dev/null
+++ b/server/licenses/lucene-core-7.4.0-snapshot-1ed95c097b.jar.sha1
@@ -0,0 +1 @@
+0b06e4f6514256a3f187a9892e520638b9c59e63
\ No newline at end of file
diff --git a/server/licenses/lucene-grouping-7.3.0.jar.sha1 b/server/licenses/lucene-grouping-7.3.0.jar.sha1
deleted file mode 100644
index 703384a64de9a..0000000000000
--- a/server/licenses/lucene-grouping-7.3.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-20a5c472a8be9bec7aa40472791389e875b9e1f2
\ No newline at end of file
diff --git a/server/licenses/lucene-grouping-7.4.0-snapshot-1ed95c097b.jar.sha1 b/server/licenses/lucene-grouping-7.4.0-snapshot-1ed95c097b.jar.sha1
new file mode 100644
index 0000000000000..cb3b6eab5dbb7
--- /dev/null
+++ b/server/licenses/lucene-grouping-7.4.0-snapshot-1ed95c097b.jar.sha1
@@ -0,0 +1 @@
+4c71cef87fe513a7a96c2a7980ed6f7c2b015763
\ No newline at end of file
diff --git a/server/licenses/lucene-highlighter-7.3.0.jar.sha1 b/server/licenses/lucene-highlighter-7.3.0.jar.sha1
deleted file mode 100644
index 6e38e2560636f..0000000000000
--- a/server/licenses/lucene-highlighter-7.3.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1f92c7d3d9bc2765fe6195bcc4fcb160d11175cc
\ No newline at end of file
diff --git a/server/licenses/lucene-highlighter-7.4.0-snapshot-1ed95c097b.jar.sha1 b/server/licenses/lucene-highlighter-7.4.0-snapshot-1ed95c097b.jar.sha1
new file mode 100644
index 0000000000000..5ef97ed311d3c
--- /dev/null
+++ b/server/licenses/lucene-highlighter-7.4.0-snapshot-1ed95c097b.jar.sha1
@@ -0,0 +1 @@
+665e044d1180100940bccd7e8e41dde48e342da3
\ No newline at end of file
diff --git a/server/licenses/lucene-join-7.3.0.jar.sha1 b/server/licenses/lucene-join-7.3.0.jar.sha1
deleted file mode 100644
index d7213d76a62aa..0000000000000
--- a/server/licenses/lucene-join-7.3.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-da4af75a7e4fe7843fbfa4b58e6a238b6b706d64
\ No newline at end of file
diff --git a/server/licenses/lucene-join-7.4.0-snapshot-1ed95c097b.jar.sha1 b/server/licenses/lucene-join-7.4.0-snapshot-1ed95c097b.jar.sha1
new file mode 100644
index 0000000000000..62afc759b6d8f
--- /dev/null
+++ b/server/licenses/lucene-join-7.4.0-snapshot-1ed95c097b.jar.sha1
@@ -0,0 +1 @@
+d343bbf5792f5969288b59b51179acd29d04f4ee
\ No newline at end of file
diff --git a/server/licenses/lucene-memory-7.3.0.jar.sha1 b/server/licenses/lucene-memory-7.3.0.jar.sha1
deleted file mode 100644
index 6bb4a4d832d54..0000000000000
--- a/server/licenses/lucene-memory-7.3.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-fc45b02a5086ec454e6d6ae81fc2cbe7be1c0902
\ No newline at end of file
diff --git a/server/licenses/lucene-memory-7.4.0-snapshot-1ed95c097b.jar.sha1 b/server/licenses/lucene-memory-7.4.0-snapshot-1ed95c097b.jar.sha1
new file mode 100644
index 0000000000000..1c14266186407
--- /dev/null
+++ b/server/licenses/lucene-memory-7.4.0-snapshot-1ed95c097b.jar.sha1
@@ -0,0 +1 @@
+8915f3c93af3348655bcc204289f9011835738a2
\ No newline at end of file
diff --git a/server/licenses/lucene-misc-7.3.0.jar.sha1 b/server/licenses/lucene-misc-7.3.0.jar.sha1
deleted file mode 100644
index 43c777150a3e1..0000000000000
--- a/server/licenses/lucene-misc-7.3.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b6a2418a94b84c29c4b9fcfe4381f2cc1aa4c214
\ No newline at end of file
diff --git a/server/licenses/lucene-misc-7.4.0-snapshot-1ed95c097b.jar.sha1 b/server/licenses/lucene-misc-7.4.0-snapshot-1ed95c097b.jar.sha1
new file mode 100644
index 0000000000000..de39af3dcefe7
--- /dev/null
+++ b/server/licenses/lucene-misc-7.4.0-snapshot-1ed95c097b.jar.sha1
@@ -0,0 +1 @@
+e7dc67b42eca3b1546a36370b6dcda0f83b2eb7d
\ No newline at end of file
diff --git a/server/licenses/lucene-queries-7.3.0.jar.sha1 b/server/licenses/lucene-queries-7.3.0.jar.sha1
deleted file mode 100644
index b0ef2b4d0eb84..0000000000000
--- a/server/licenses/lucene-queries-7.3.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6292a5579a6ab3423ceca60d2ea41cd86481e7c0
\ No newline at end of file
diff --git a/server/licenses/lucene-queries-7.4.0-snapshot-1ed95c097b.jar.sha1 b/server/licenses/lucene-queries-7.4.0-snapshot-1ed95c097b.jar.sha1
new file mode 100644
index 0000000000000..6d1e73a5abc40
--- /dev/null
+++ b/server/licenses/lucene-queries-7.4.0-snapshot-1ed95c097b.jar.sha1
@@ -0,0 +1 @@
+5946d5e2be276f66e9ff6d6111acabb03a9330d9
\ No newline at end of file
diff --git a/server/licenses/lucene-queryparser-7.3.0.jar.sha1 b/server/licenses/lucene-queryparser-7.3.0.jar.sha1
deleted file mode 100644
index 87a1d74498d82..0000000000000
--- a/server/licenses/lucene-queryparser-7.3.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-95b2563e5337377dde2eb987b3fce144be5e7a77
\ No newline at end of file
diff --git a/server/licenses/lucene-queryparser-7.4.0-snapshot-1ed95c097b.jar.sha1 b/server/licenses/lucene-queryparser-7.4.0-snapshot-1ed95c097b.jar.sha1
new file mode 100644
index 0000000000000..ae79d443ff5e7
--- /dev/null
+++ b/server/licenses/lucene-queryparser-7.4.0-snapshot-1ed95c097b.jar.sha1
@@ -0,0 +1 @@
+d9fc5fc63f3d861e5af72e11373368e8a4c6bba6
\ No newline at end of file
diff --git a/server/licenses/lucene-sandbox-7.3.0.jar.sha1 b/server/licenses/lucene-sandbox-7.3.0.jar.sha1
deleted file mode 100644
index 605263a2296ff..0000000000000
--- a/server/licenses/lucene-sandbox-7.3.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1efd2fa7cba1e359e3fbb8b4c11cab37024b2178
\ No newline at end of file
diff --git a/server/licenses/lucene-sandbox-7.4.0-snapshot-1ed95c097b.jar.sha1 b/server/licenses/lucene-sandbox-7.4.0-snapshot-1ed95c097b.jar.sha1
new file mode 100644
index 0000000000000..50022d2e6de46
--- /dev/null
+++ b/server/licenses/lucene-sandbox-7.4.0-snapshot-1ed95c097b.jar.sha1
@@ -0,0 +1 @@
+ee283c0a1a717f3e0915de75864a93d043efaee3
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial-7.3.0.jar.sha1 b/server/licenses/lucene-spatial-7.3.0.jar.sha1
deleted file mode 100644
index 4fcd32b5d29bb..0000000000000
--- a/server/licenses/lucene-spatial-7.3.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-93512c2160bdc3e602141329e5945a91918b6752
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial-7.4.0-snapshot-1ed95c097b.jar.sha1 b/server/licenses/lucene-spatial-7.4.0-snapshot-1ed95c097b.jar.sha1
new file mode 100644
index 0000000000000..4371f75994f29
--- /dev/null
+++ b/server/licenses/lucene-spatial-7.4.0-snapshot-1ed95c097b.jar.sha1
@@ -0,0 +1 @@
+e1adf0220a7c052ac81e2919ffac24ac0e5b007c
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial-extras-7.3.0.jar.sha1 b/server/licenses/lucene-spatial-extras-7.3.0.jar.sha1
deleted file mode 100644
index 0f078420cdb19..0000000000000
--- a/server/licenses/lucene-spatial-extras-7.3.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-47090d8ddf99f6bbb64ee8ab7a76c3cd3165b88f
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial-extras-7.4.0-snapshot-1ed95c097b.jar.sha1 b/server/licenses/lucene-spatial-extras-7.4.0-snapshot-1ed95c097b.jar.sha1
new file mode 100644
index 0000000000000..a27beb76ff6a4
--- /dev/null
+++ b/server/licenses/lucene-spatial-extras-7.4.0-snapshot-1ed95c097b.jar.sha1
@@ -0,0 +1 @@
+6d9306053942c48f43392a634f11a95462b5996e
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial3d-7.3.0.jar.sha1 b/server/licenses/lucene-spatial3d-7.3.0.jar.sha1
deleted file mode 100644
index 268ed39a78405..0000000000000
--- a/server/licenses/lucene-spatial3d-7.3.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ed8f07d67445d5acde6597996461640b2d92fa08
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial3d-7.4.0-snapshot-1ed95c097b.jar.sha1 b/server/licenses/lucene-spatial3d-7.4.0-snapshot-1ed95c097b.jar.sha1
new file mode 100644
index 0000000000000..8db76c8605c71
--- /dev/null
+++ b/server/licenses/lucene-spatial3d-7.4.0-snapshot-1ed95c097b.jar.sha1
@@ -0,0 +1 @@
+2334e8c5f4d0f98659b30e0c2035296e4aae8ff5
\ No newline at end of file
diff --git a/server/licenses/lucene-suggest-7.3.0.jar.sha1 b/server/licenses/lucene-suggest-7.3.0.jar.sha1
deleted file mode 100644
index 798238ce58bc1..0000000000000
--- a/server/licenses/lucene-suggest-7.3.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6034ccf6b27c659ab7a2678680bae8390fbfc40a
\ No newline at end of file
diff --git a/server/licenses/lucene-suggest-7.4.0-snapshot-1ed95c097b.jar.sha1 b/server/licenses/lucene-suggest-7.4.0-snapshot-1ed95c097b.jar.sha1
new file mode 100644
index 0000000000000..84acdbd0d0b01
--- /dev/null
+++ b/server/licenses/lucene-suggest-7.4.0-snapshot-1ed95c097b.jar.sha1
@@ -0,0 +1 @@
+f2b2c454eb7b5d73b9df1390ea4730ce3dd4e463
\ No newline at end of file
diff --git a/server/src/main/java/org/elasticsearch/Version.java b/server/src/main/java/org/elasticsearch/Version.java
index 5142f1cb84b91..af6cfa2883578 100644
--- a/server/src/main/java/org/elasticsearch/Version.java
+++ b/server/src/main/java/org/elasticsearch/Version.java
@@ -174,7 +174,7 @@ public class Version implements Comparable<Version>, ToXContentFragment {
     public static final Version V_6_4_0 = new Version(V_6_4_0_ID, org.apache.lucene.util.Version.LUCENE_7_3_0);
     public static final int V_7_0_0_alpha1_ID = 7000001;
     public static final Version V_7_0_0_alpha1 =
-        new Version(V_7_0_0_alpha1_ID, org.apache.lucene.util.Version.LUCENE_7_3_0);
+        new Version(V_7_0_0_alpha1_ID, org.apache.lucene.util.Version.LUCENE_7_4_0);
     public static final Version CURRENT = V_7_0_0_alpha1;
 
     static {
diff --git a/test/framework/src/main/java/org/elasticsearch/indices/analysis/AnalysisFactoryTestCase.java b/test/framework/src/main/java/org/elasticsearch/indices/analysis/AnalysisFactoryTestCase.java
index 232ad14aabc55..656ec8c1fb0e7 100644
--- a/test/framework/src/main/java/org/elasticsearch/indices/analysis/AnalysisFactoryTestCase.java
+++ b/test/framework/src/main/java/org/elasticsearch/indices/analysis/AnalysisFactoryTestCase.java
@@ -131,6 +131,7 @@ private static String toCamelCase(String s) {
         .put("englishminimalstem",        MovedToAnalysisCommon.class)
         .put("englishpossessive",         MovedToAnalysisCommon.class)
         .put("finnishlightstem",          MovedToAnalysisCommon.class)
+        .put("fixedshingle",              MovedToAnalysisCommon.class)
         .put("frenchlightstem",           MovedToAnalysisCommon.class)
         .put("frenchminimalstem",         MovedToAnalysisCommon.class)
         .put("galicianminimalstem",       MovedToAnalysisCommon.class)
diff --git a/x-pack/plugin/sql/jdbc/licenses/lucene-core-7.3.0.jar.sha1 b/x-pack/plugin/sql/jdbc/licenses/lucene-core-7.3.0.jar.sha1
deleted file mode 100644
index e12c932b38dd0..0000000000000
--- a/x-pack/plugin/sql/jdbc/licenses/lucene-core-7.3.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-040e2de30c5e6bad868b144e371730200719ceb3
\ No newline at end of file
diff --git a/x-pack/plugin/sql/jdbc/licenses/lucene-core-7.4.0-snapshot-1ed95c097b.jar.sha1 b/x-pack/plugin/sql/jdbc/licenses/lucene-core-7.4.0-snapshot-1ed95c097b.jar.sha1
new file mode 100644
index 0000000000000..20da7d0f78e9d
--- /dev/null
+++ b/x-pack/plugin/sql/jdbc/licenses/lucene-core-7.4.0-snapshot-1ed95c097b.jar.sha1
@@ -0,0 +1 @@
+0b06e4f6514256a3f187a9892e520638b9c59e63
\ No newline at end of file
diff --git a/x-pack/plugin/sql/sql-proto/licenses/lucene-core-7.3.0.jar.sha1 b/x-pack/plugin/sql/sql-proto/licenses/lucene-core-7.3.0.jar.sha1
deleted file mode 100644
index e12c932b38dd0..0000000000000
--- a/x-pack/plugin/sql/sql-proto/licenses/lucene-core-7.3.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-040e2de30c5e6bad868b144e371730200719ceb3
\ No newline at end of file
diff --git a/x-pack/plugin/sql/sql-proto/licenses/lucene-core-7.4.0-snapshot-1ed95c097b.jar.sha1 b/x-pack/plugin/sql/sql-proto/licenses/lucene-core-7.4.0-snapshot-1ed95c097b.jar.sha1
new file mode 100644
index 0000000000000..20da7d0f78e9d
--- /dev/null
+++ b/x-pack/plugin/sql/sql-proto/licenses/lucene-core-7.4.0-snapshot-1ed95c097b.jar.sha1
@@ -0,0 +1 @@
+0b06e4f6514256a3f187a9892e520638b9c59e63
\ No newline at end of file