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-0c89db8425
 
 # 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/...ommon/src/main/java/org/elasticsearch/analysis/common/FixedShingleTokenFilterFactory.java b/...ommon/src/main/java/org/elasticsearch/analysis/common/FixedShingleTokenFilterFactory.java
@@ -0,0 +1,50 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.analysis.common;
+
+import org.apache.lucene.analysis.TokenStream;
+import org.apache.lucene.analysis.miscellaneous.DisableGraphAttribute;
+import org.apache.lucene.analysis.shingle.FixedShingleFilter;
+import org.apache.lucene.analysis.shingle.ShingleFilter;
+import org.elasticsearch.Version;
+import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.env.Environment;
+import org.elasticsearch.index.IndexSettings;
+import org.elasticsearch.index.analysis.AbstractTokenFilterFactory;
+import org.elasticsearch.index.analysis.TokenFilterFactory;
+
+public class FixedShingleTokenFilterFactory extends AbstractTokenFilterFactory {
+    private final int shingleSize;
+    private final String tokenSeparator;
+    private final String fillerToken;
+
+    public FixedShingleTokenFilterFactory(IndexSettings indexSettings, Environment environment, String name, Settings settings) {
+        super(indexSettings, name, settings);
+        this.shingleSize = settings.getAsInt("shingle_size", ShingleFilter.DEFAULT_MAX_SHINGLE_SIZE);
+        this.tokenSeparator = settings.get("token_separator", ShingleFilter.DEFAULT_TOKEN_SEPARATOR);
+        this.fillerToken = settings.get("filler_token", ShingleFilter.DEFAULT_FILLER_TOKEN);
+    }
+
+
+    @Override
+    public TokenStream create(TokenStream tokenStream) {
+        return new FixedShingleFilter(tokenStream, shingleSize, tokenSeparator, fillerToken);
+    }
+}
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-0c89db8425.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-7.4.0-snapshot-0c89db8425.jar.sha1
@@ -0,0 +1 @@
+2b4add2c5d9becd5196bb9b3f33498f9a8a8d1dc
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-0c89db8425.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.4.0-snapshot-0c89db8425.jar.sha1
@@ -0,0 +1 @@
+c343d968621d0e450e7bc28a69067fd7a78fd679
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-0c89db8425.jar.sha1 b/...s/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.4.0-snapshot-0c89db8425.jar.sha1
@@ -0,0 +1 @@
+719133476276d857cdcebbb65031b6822f6430f3
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-0c89db8425.jar.sha1 b/...s/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.4.0-snapshot-0c89db8425.jar.sha1
@@ -0,0 +1 @@
+443864fe5b85adae4b2123364d202918d2702636
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-0c89db8425.jar.sha1 b/...ins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.4.0-snapshot-0c89db8425.jar.sha1
@@ -0,0 +1 @@
+aa9c9b02b41e8e231648c2bbe7c4dd9a05957e73
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-0c89db8425.jar.sha1 b/...ins/analysis-stempel/licenses/lucene-analyzers-stempel-7.4.0-snapshot-0c89db8425.jar.sha1
@@ -0,0 +1 @@
+1cccb1582abf13bacc1508e4b79273fdda0d8ea7
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-0c89db8425.jar.sha1 b/...nalysis-ukrainian/licenses/lucene-analyzers-morfologik-7.4.0-snapshot-0c89db8425.jar.sha1
@@ -0,0 +1 @@
+7e7e979531ff207ad205fdb5ea6ff33ef616d793
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-0c89db8425.jar.sha1 b/server/licenses/lucene-analyzers-common-7.4.0-snapshot-0c89db8425.jar.sha1
@@ -0,0 +1 @@
+f70708cbdf3b6caca181e2e5062b7fecbc81a40f
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-0c89db8425.jar.sha1 b/server/licenses/lucene-backward-codecs-7.4.0-snapshot-0c89db8425.jar.sha1
@@ -0,0 +1 @@
+476ab849b429b28f87bbce9023c09cc26031e448
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-0c89db8425.jar.sha1 b/server/licenses/lucene-core-7.4.0-snapshot-0c89db8425.jar.sha1
@@ -0,0 +1 @@
+818c9e60452cc16963bedf66bdb1c33d2ab01c75
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-0c89db8425.jar.sha1 b/server/licenses/lucene-grouping-7.4.0-snapshot-0c89db8425.jar.sha1
@@ -0,0 +1 @@
+5458db127655d66e5d8886724b8aeb99da84e621
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-0c89db8425.jar.sha1 b/server/licenses/lucene-highlighter-7.4.0-snapshot-0c89db8425.jar.sha1
@@ -0,0 +1 @@
+12d55dac5dd58bf5d36a0633f5a70eb54d525df0
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-0c89db8425.jar.sha1 b/server/licenses/lucene-join-7.4.0-snapshot-0c89db8425.jar.sha1
@@ -0,0 +1 @@
+cb79ebfd3879a15b117619c674404573a9437cd3
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-0c89db8425.jar.sha1 b/server/licenses/lucene-memory-7.4.0-snapshot-0c89db8425.jar.sha1
@@ -0,0 +1 @@
+efb0a875d15a58035ce7fa483b15f9a8deb6ec79
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-0c89db8425.jar.sha1 b/server/licenses/lucene-misc-7.4.0-snapshot-0c89db8425.jar.sha1
@@ -0,0 +1 @@
+c8d27935b17351ee0636bb1ea34c1902d4da8041
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-0c89db8425.jar.sha1 b/server/licenses/lucene-queries-7.4.0-snapshot-0c89db8425.jar.sha1
@@ -0,0 +1 @@
+ec48f8c323e7021249e9803a2a821cb5e2b28399
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-0c89db8425.jar.sha1 b/server/licenses/lucene-queryparser-7.4.0-snapshot-0c89db8425.jar.sha1
@@ -0,0 +1 @@
+51e27a3644618134c6524bbedc18ffd8b120ac95
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-0c89db8425.jar.sha1 b/server/licenses/lucene-sandbox-7.4.0-snapshot-0c89db8425.jar.sha1
@@ -0,0 +1 @@
+77129b009fc71779e0a07cf804da11b3025a9f45
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-0c89db8425.jar.sha1 b/server/licenses/lucene-spatial-7.4.0-snapshot-0c89db8425.jar.sha1
@@ -0,0 +1 @@
+e8cbf7a1ddf7263c2c0d43a7d18250912d5bd869
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-0c89db8425.jar.sha1 b/server/licenses/lucene-spatial-extras-7.4.0-snapshot-0c89db8425.jar.sha1
@@ -0,0 +1 @@
+d9fd22d61a148e597b5beb4e17a88660c39bcf5b
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-0c89db8425.jar.sha1 b/server/licenses/lucene-spatial3d-7.4.0-snapshot-0c89db8425.jar.sha1
@@ -0,0 +1 @@
+62dc45994535e75540278c8cc42099ddc21c2b2c
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-0c89db8425.jar.sha1 b/server/licenses/lucene-suggest-7.4.0-snapshot-0c89db8425.jar.sha1
@@ -0,0 +1 @@
+b291683bc0f30cddc4161070757135c7b4e4569d
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-0c89db8425.jar.sha1 b/x-pack/plugin/sql/jdbc/licenses/lucene-core-7.4.0-snapshot-0c89db8425.jar.sha1
@@ -0,0 +1 @@
+818c9e60452cc16963bedf66bdb1c33d2ab01c75
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-0c89db8425.jar.sha1 b/x-pack/plugin/sql/sql-proto/licenses/lucene-core-7.4.0-snapshot-0c89db8425.jar.sha1
@@ -0,0 +1 @@
+818c9e60452cc16963bedf66bdb1c33d2ab01c75