elastic · jimczi · May 4, 2018 · May 3, 2018 · May 3, 2018 · May 3, 2018
diff --git 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-8fdd3d7584
 
 # optional dependencies
 spatial4j         = 0.7

diff --git 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/...is-common/src/test/java/org/elasticsearch/analysis/common/CommonAnalysisFactoryTests.java b/...is-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
diff --git a/modules/lang-expression/licenses/lucene-expressions-7.4.0-snapshot-8fdd3d7584.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-7.4.0-snapshot-8fdd3d7584.jar.sha1
@@ -0,0 +1 @@
+d6d20397faa02b085305232a8de448229baee8f8
diff --git 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
diff --git a/plugins/analysis-icu/licenses/icu4j-61.1.jar.sha1 b/plugins/analysis-icu/licenses/icu4j-61.1.jar.sha1
@@ -0,0 +1 @@
+28d33b5e44e72edcc66a5da7a34a42147f38d987
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
diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.4.0-snapshot-8fdd3d7584.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.4.0-snapshot-8fdd3d7584.jar.sha1
@@ -0,0 +1 @@
+d343acbf7d5cec95de5a447fc638d68551f4a55c
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
@@ -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
diff --git a/...s/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.4.0-snapshot-8fdd3d7584.jar.sha1 b/...s/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.4.0-snapshot-8fdd3d7584.jar.sha1
@@ -0,0 +1 @@
+085d4f53095c18f0b0a3269d7aed2a94cc2c2f82
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
diff --git a/...s/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.4.0-snapshot-8fdd3d7584.jar.sha1 b/...s/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.4.0-snapshot-8fdd3d7584.jar.sha1
@@ -0,0 +1 @@
+a0b9536b30a760bb24dcaae63a60f38b78cc4894
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
diff --git a/...ins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.4.0-snapshot-8fdd3d7584.jar.sha1 b/...ins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.4.0-snapshot-8fdd3d7584.jar.sha1
@@ -0,0 +1 @@
+3292c2e5ca71fdddf72333060520794608fee82f
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
diff --git a/...ins/analysis-stempel/licenses/lucene-analyzers-stempel-7.4.0-snapshot-8fdd3d7584.jar.sha1 b/...ins/analysis-stempel/licenses/lucene-analyzers-stempel-7.4.0-snapshot-8fdd3d7584.jar.sha1
@@ -0,0 +1 @@
+1626aa2aff3e8d70c6cba6807574c6bf1f72911f
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
diff --git a/...nalysis-ukrainian/licenses/lucene-analyzers-morfologik-7.4.0-snapshot-8fdd3d7584.jar.sha1 b/...nalysis-ukrainian/licenses/lucene-analyzers-morfologik-7.4.0-snapshot-8fdd3d7584.jar.sha1
@@ -0,0 +1 @@
+2a7c24bbff29c8d88e9c847566f39ca48fc1c5f3
diff --git a/server/licenses/lucene-analyzers-common-7.3.0.jar.sha1 b/server/licenses/lucene-analyzers-common-7.3.0.jar.sha1
diff --git a/server/licenses/lucene-analyzers-common-7.4.0-snapshot-8fdd3d7584.jar.sha1 b/server/licenses/lucene-analyzers-common-7.4.0-snapshot-8fdd3d7584.jar.sha1
@@ -0,0 +1 @@
+21da589fce03a1ed57d58daf648830c8d244be2c
diff --git a/server/licenses/lucene-backward-codecs-7.3.0.jar.sha1 b/server/licenses/lucene-backward-codecs-7.3.0.jar.sha1
diff --git a/server/licenses/lucene-backward-codecs-7.4.0-snapshot-8fdd3d7584.jar.sha1 b/server/licenses/lucene-backward-codecs-7.4.0-snapshot-8fdd3d7584.jar.sha1
@@ -0,0 +1 @@
+c6bd002000c4a8e8f4f70719b09b5d07a8d3f447
diff --git a/server/licenses/lucene-core-7.3.0.jar.sha1 b/server/licenses/lucene-core-7.3.0.jar.sha1
diff --git a/server/licenses/lucene-core-7.4.0-snapshot-8fdd3d7584.jar.sha1 b/server/licenses/lucene-core-7.4.0-snapshot-8fdd3d7584.jar.sha1
@@ -0,0 +1 @@
+45d866d37d0a399ddf417650351d624243f729c5
diff --git a/server/licenses/lucene-grouping-7.3.0.jar.sha1 b/server/licenses/lucene-grouping-7.3.0.jar.sha1
diff --git a/server/licenses/lucene-grouping-7.4.0-snapshot-8fdd3d7584.jar.sha1 b/server/licenses/lucene-grouping-7.4.0-snapshot-8fdd3d7584.jar.sha1
@@ -0,0 +1 @@
+0cae6ce2022ac170286491769d7725a04ea1bf6e
diff --git a/server/licenses/lucene-highlighter-7.3.0.jar.sha1 b/server/licenses/lucene-highlighter-7.3.0.jar.sha1
diff --git a/server/licenses/lucene-highlighter-7.4.0-snapshot-8fdd3d7584.jar.sha1 b/server/licenses/lucene-highlighter-7.4.0-snapshot-8fdd3d7584.jar.sha1
@@ -0,0 +1 @@
+c87cc4511ed8497c35b8c0f95ff5eb733e2431de
diff --git a/server/licenses/lucene-join-7.3.0.jar.sha1 b/server/licenses/lucene-join-7.3.0.jar.sha1
diff --git a/server/licenses/lucene-join-7.4.0-snapshot-8fdd3d7584.jar.sha1 b/server/licenses/lucene-join-7.4.0-snapshot-8fdd3d7584.jar.sha1
@@ -0,0 +1 @@
+166d69a3893d9f74091af0ada1eba6116bfa8066
diff --git a/server/licenses/lucene-memory-7.3.0.jar.sha1 b/server/licenses/lucene-memory-7.3.0.jar.sha1
diff --git a/server/licenses/lucene-memory-7.4.0-snapshot-8fdd3d7584.jar.sha1 b/server/licenses/lucene-memory-7.4.0-snapshot-8fdd3d7584.jar.sha1
@@ -0,0 +1 @@
+570971281d8da7ac430ada72872a72c6cbb6f591
diff --git a/server/licenses/lucene-misc-7.3.0.jar.sha1 b/server/licenses/lucene-misc-7.3.0.jar.sha1
diff --git a/server/licenses/lucene-misc-7.4.0-snapshot-8fdd3d7584.jar.sha1 b/server/licenses/lucene-misc-7.4.0-snapshot-8fdd3d7584.jar.sha1
@@ -0,0 +1 @@
+c7b9ddf76de584ace8000fe524de19c699423377
diff --git a/server/licenses/lucene-queries-7.3.0.jar.sha1 b/server/licenses/lucene-queries-7.3.0.jar.sha1
diff --git a/server/licenses/lucene-queries-7.4.0-snapshot-8fdd3d7584.jar.sha1 b/server/licenses/lucene-queries-7.4.0-snapshot-8fdd3d7584.jar.sha1
@@ -0,0 +1 @@
+c6a041fcea03c697d8a6e2909db2753a448d8bd7
diff --git a/server/licenses/lucene-queryparser-7.3.0.jar.sha1 b/server/licenses/lucene-queryparser-7.3.0.jar.sha1
diff --git a/server/licenses/lucene-queryparser-7.4.0-snapshot-8fdd3d7584.jar.sha1 b/server/licenses/lucene-queryparser-7.4.0-snapshot-8fdd3d7584.jar.sha1
@@ -0,0 +1 @@
+953f2f4266d43788e31c1b89ee92108de18bf7c8
diff --git a/server/licenses/lucene-sandbox-7.3.0.jar.sha1 b/server/licenses/lucene-sandbox-7.3.0.jar.sha1
diff --git a/server/licenses/lucene-sandbox-7.4.0-snapshot-8fdd3d7584.jar.sha1 b/server/licenses/lucene-sandbox-7.4.0-snapshot-8fdd3d7584.jar.sha1
@@ -0,0 +1 @@
+12bb5da2e9c04f61abd02feeb4ec5afdcc0c2eab
diff --git a/server/licenses/lucene-spatial-7.3.0.jar.sha1 b/server/licenses/lucene-spatial-7.3.0.jar.sha1
diff --git a/server/licenses/lucene-spatial-7.4.0-snapshot-8fdd3d7584.jar.sha1 b/server/licenses/lucene-spatial-7.4.0-snapshot-8fdd3d7584.jar.sha1
@@ -0,0 +1 @@
+96923ae0bef5b6393ac00a181013eed9d6c3b186
diff --git a/server/licenses/lucene-spatial-extras-7.3.0.jar.sha1 b/server/licenses/lucene-spatial-extras-7.3.0.jar.sha1
diff --git a/server/licenses/lucene-spatial-extras-7.4.0-snapshot-8fdd3d7584.jar.sha1 b/server/licenses/lucene-spatial-extras-7.4.0-snapshot-8fdd3d7584.jar.sha1
@@ -0,0 +1 @@
+b03947a063353dd42270e3373f17ca8c5c752e8e
diff --git a/server/licenses/lucene-spatial3d-7.3.0.jar.sha1 b/server/licenses/lucene-spatial3d-7.3.0.jar.sha1
diff --git a/server/licenses/lucene-spatial3d-7.4.0-snapshot-8fdd3d7584.jar.sha1 b/server/licenses/lucene-spatial3d-7.4.0-snapshot-8fdd3d7584.jar.sha1
@@ -0,0 +1 @@
+2dded2983d5bf5e0a7d15e5928a63c220dfc2168
diff --git a/server/licenses/lucene-suggest-7.3.0.jar.sha1 b/server/licenses/lucene-suggest-7.3.0.jar.sha1
diff --git a/server/licenses/lucene-suggest-7.4.0-snapshot-8fdd3d7584.jar.sha1 b/server/licenses/lucene-suggest-7.4.0-snapshot-8fdd3d7584.jar.sha1
@@ -0,0 +1 @@
+9243da53e6d9bd9039f4936aa6264e6f5b33c70c
diff --git 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
@@ -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
diff --git a/x-pack/plugin/sql/jdbc/licenses/lucene-core-7.4.0-snapshot-8fdd3d7584.jar.sha1 b/x-pack/plugin/sql/jdbc/licenses/lucene-core-7.4.0-snapshot-8fdd3d7584.jar.sha1
@@ -0,0 +1 @@
+45d866d37d0a399ddf417650351d624243f729c5
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
diff --git a/x-pack/plugin/sql/sql-proto/licenses/lucene-core-7.4.0-snapshot-8fdd3d7584.jar.sha1 b/x-pack/plugin/sql/sql-proto/licenses/lucene-core-7.4.0-snapshot-8fdd3d7584.jar.sha1
@@ -0,0 +1 @@
+45d866d37d0a399ddf417650351d624243f729c5