Upgrade to Lucene-7.4.0-snapshot-2b27dd846a (#29398)

This snapshot version supports soft delete and the merge policy.

buildSrc/version.properties

@@ -1,5 +1,5 @@
 elasticsearch     = 7.0.0-alpha1
-lucene            = 7.3.0
+lucene            = 7.4.0-snapshot-2b27dd846a
 
 # optional dependencies
 spatial4j         = 0.7

docs/Versions.asciidoc

@@ -1,7 +1,7 @@
 :version:               7.0.0-alpha1
 :major-version:         7.x
-:lucene_version:        7.3.0
+:lucene_version:        7.4.0
-:lucene_version_path:   7_3_0
+:lucene_version_path:   7_4_0
 :branch:                master
 :jdk:                   1.8.0_131
 :jdk_major:             8

modules/lang-expression/licenses/lucene-expressions-7.3.0.jar.sha1

@@ -1 +0,0 @@
-cb82d9db3043bbd25b4d0eb5022ed1e529c936d3

modules/lang-expression/licenses/lucene-expressions-7.4.0-snapshot-2b27dd846a.jar.sha1

@@ -0,0 +1 @@
+293527218a87678d0a553a3167a5a0380b5ae06d

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 {

plugins/analysis-icu/licenses/icu4j-59.1.jar.sha1

@@ -1 +0,0 @@
-6f06e820cf4c8968bbbaae66ae0b33f6a256b57f

plugins/analysis-icu/licenses/icu4j-61.1.jar.sha1

@@ -0,0 +1 @@
+28d33b5e44e72edcc66a5da7a34a42147f38d987

plugins/analysis-icu/licenses/lucene-analyzers-icu-7.3.0.jar.sha1

@@ -1 +0,0 @@
-c09216a18658d5b2912566efff8665e45edc24b4

plugins/analysis-icu/licenses/lucene-analyzers-icu-7.4.0-snapshot-2b27dd846a.jar.sha1

@@ -0,0 +1 @@
+990c183a996646534b0dfe1419fab284c5395c23

plugins/analysis-icu/src/main/java/org/elasticsearch/index/analysis/IcuTokenizerFactory.java

@@ -80,7 +80,7 @@ public class IcuTokenizerFactory extends AbstractTokenizerFactory {
             if (tailored.isEmpty()) {
                 return null;
             } else {
-                final BreakIterator breakers[] = new BreakIterator[UScript.CODE_LIMIT];
+                final RuleBasedBreakIterator breakers[] = new RuleBasedBreakIterator[UScript.CODE_LIMIT];
                 for (Map.Entry<Integer, String> entry : tailored.entrySet()) {
                     int code = entry.getKey();
                     String resourcePath = entry.getValue();
@@ -89,9 +89,9 @@ public class IcuTokenizerFactory extends AbstractTokenizerFactory {
                 // 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);
                         }
@@ -105,7 +105,7 @@ public class IcuTokenizerFactory extends AbstractTokenizerFactory {
     }
 
     //parse a single RBBi rule file
-    private BreakIterator parseRules(String filename, Environment env) throws IOException {
+    private RuleBasedBreakIterator parseRules(String filename, Environment env) throws IOException {
 
         final Path path = env.configFile().resolve(filename);
         String rules = Files.readAllLines(path)

plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.3.0.jar.sha1

@@ -1 +0,0 @@
-c9d5bbd0affa90b46e173c762c35419a54977c35

plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.4.0-snapshot-2b27dd846a.jar.sha1

@@ -0,0 +1 @@
+77f5389bc0a6b148c0350828b9afe668c2ba0a53

plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.3.0.jar.sha1

@@ -1 +0,0 @@
-4e6c63fa8ae005d81d12f0d88ffa98346b443ac4

plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.4.0-snapshot-2b27dd846a.jar.sha1

@@ -0,0 +1 @@
+1392f3199619a60b334b437521a8ca1f6c40f2d7

plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.3.0.jar.sha1

@@ -1 +0,0 @@
-37b7ff0a6493f139cb77f5bda965ac0189c8efd1

plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.4.0-snapshot-2b27dd846a.jar.sha1

@@ -0,0 +1 @@
+56849066c186bd76df09d77c25c36ea01b97e4e4

plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.3.0.jar.sha1

@@ -1 +0,0 @@
-d189185da23b2221c4d532da5e2cacce735f8a0c

plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.4.0-snapshot-2b27dd846a.jar.sha1

@@ -0,0 +1 @@
+69540401c4dc014107962a8c2343c95f6d1e7935

plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.3.0.jar.sha1

@@ -1 +0,0 @@
-74462b51de45afe708f1042cc901fe7370413871

plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.4.0-snapshot-2b27dd846a.jar.sha1

@@ -0,0 +1 @@
+7bd1cd163de07d4c31e01f0a2ecf75fb63c2dd64

server/licenses/lucene-analyzers-common-7.3.0.jar.sha1

@@ -1 +0,0 @@
-4325a5cdf8d3fa23f326cd86a2297fee2bc844f5

server/licenses/lucene-analyzers-common-7.4.0-snapshot-2b27dd846a.jar.sha1

@@ -0,0 +1 @@
+8e73f873c08b83da185728ef3637f6a602ff8ded

server/licenses/lucene-backward-codecs-7.3.0.jar.sha1

@@ -1 +0,0 @@
-3b618a21a924cb35ac1f27d3ca47d9ed04f43588

server/licenses/lucene-backward-codecs-7.4.0-snapshot-2b27dd846a.jar.sha1

@@ -0,0 +1 @@
+a7fbea1c4793894889d95369aef02c7ec8a1b231

server/licenses/lucene-core-7.3.0.jar.sha1

@@ -1 +0,0 @@
-040e2de30c5e6bad868b144e371730200719ceb3

server/licenses/lucene-core-7.4.0-snapshot-2b27dd846a.jar.sha1

@@ -0,0 +1 @@
+77c2e408bfc736db91a9778f49903736f4a55194

server/licenses/lucene-grouping-7.3.0.jar.sha1

@@ -1 +0,0 @@
-20a5c472a8be9bec7aa40472791389e875b9e1f2

server/licenses/lucene-grouping-7.4.0-snapshot-2b27dd846a.jar.sha1

@@ -0,0 +1 @@
+ac7ff2e77853c1f7a3dcfe28378cd2a87e2ea5a5

server/licenses/lucene-highlighter-7.3.0.jar.sha1

@@ -1 +0,0 @@
-1f92c7d3d9bc2765fe6195bcc4fcb160d11175cc

server/licenses/lucene-highlighter-7.4.0-snapshot-2b27dd846a.jar.sha1

@@ -0,0 +1 @@
+23796b304b08f8b76186d24999f122040a66b5f1

server/licenses/lucene-join-7.3.0.jar.sha1

@@ -1 +0,0 @@
-da4af75a7e4fe7843fbfa4b58e6a238b6b706d64

server/licenses/lucene-join-7.4.0-snapshot-2b27dd846a.jar.sha1

@@ -0,0 +1 @@
+d352ba36ea044ff1dfe461ef43098592a7f38771

server/licenses/lucene-memory-7.3.0.jar.sha1

@@ -1 +0,0 @@
-fc45b02a5086ec454e6d6ae81fc2cbe7be1c0902

server/licenses/lucene-memory-7.4.0-snapshot-2b27dd846a.jar.sha1

@@ -0,0 +1 @@
+7b82ef9d6707e1b7e15ddf0e6376e4be25aac0af

server/licenses/lucene-misc-7.3.0.jar.sha1

@@ -1 +0,0 @@
-b6a2418a94b84c29c4b9fcfe4381f2cc1aa4c214

server/licenses/lucene-misc-7.4.0-snapshot-2b27dd846a.jar.sha1

@@ -0,0 +1 @@
+33da68d1ac441ad7532d421e84bff11bfdaf17a1

server/licenses/lucene-queries-7.3.0.jar.sha1

@@ -1 +0,0 @@
-6292a5579a6ab3423ceca60d2ea41cd86481e7c0

server/licenses/lucene-queries-7.4.0-snapshot-2b27dd846a.jar.sha1

@@ -0,0 +1 @@
+56d10ae1a43cf4114987858dcb2c23e9e6ba273c

server/licenses/lucene-queryparser-7.3.0.jar.sha1

@@ -1 +0,0 @@
-95b2563e5337377dde2eb987b3fce144be5e7a77

server/licenses/lucene-queryparser-7.4.0-snapshot-2b27dd846a.jar.sha1

@@ -0,0 +1 @@
+eae428930519541a5775318ad0e4cd36355b1cf8

server/licenses/lucene-sandbox-7.3.0.jar.sha1

@@ -1 +0,0 @@
-1efd2fa7cba1e359e3fbb8b4c11cab37024b2178

server/licenses/lucene-sandbox-7.4.0-snapshot-2b27dd846a.jar.sha1

@@ -0,0 +1 @@
+d634f8369a4f72c47f6ffab50d7b956aebb2ee00

server/licenses/lucene-spatial-7.3.0.jar.sha1

@@ -1 +0,0 @@
-93512c2160bdc3e602141329e5945a91918b6752

server/licenses/lucene-spatial-7.4.0-snapshot-2b27dd846a.jar.sha1

@@ -0,0 +1 @@
+5502150001ec79a781ae047c6c4621ed04231680

server/licenses/lucene-spatial-extras-7.3.0.jar.sha1

@@ -1 +0,0 @@
-47090d8ddf99f6bbb64ee8ab7a76c3cd3165b88f

server/licenses/lucene-spatial-extras-7.4.0-snapshot-2b27dd846a.jar.sha1

@@ -0,0 +1 @@
+116feeb2e796aef059795f0e6996c37336f3eb0a

server/licenses/lucene-spatial3d-7.3.0.jar.sha1

@@ -1 +0,0 @@
-ed8f07d67445d5acde6597996461640b2d92fa08

server/licenses/lucene-spatial3d-7.4.0-snapshot-2b27dd846a.jar.sha1

@@ -0,0 +1 @@
+1492e4fe337e0cefc72113e0dc2f7a3c59ee93de

server/licenses/lucene-suggest-7.3.0.jar.sha1

@@ -1 +0,0 @@
-6034ccf6b27c659ab7a2678680bae8390fbfc40a

server/licenses/lucene-suggest-7.4.0-snapshot-2b27dd846a.jar.sha1

@@ -0,0 +1 @@
+541ccd1c4be8027e005e7a43fc66106a64522b7b

server/src/main/java/org/elasticsearch/Version.java

@@ -151,23 +151,21 @@ public class Version implements Comparable<Version>, ToXContentFragment {
     public static final Version V_6_1_3 = new Version(V_6_1_3_ID, org.apache.lucene.util.Version.LUCENE_7_1_0);
     public static final int V_6_1_4_ID = 6010499;
     public static final Version V_6_1_4 = new Version(V_6_1_4_ID, org.apache.lucene.util.Version.LUCENE_7_1_0);
-    // The below version is missing from the 7.3 JAR
-    private static final org.apache.lucene.util.Version LUCENE_7_2_1 = org.apache.lucene.util.Version.fromBits(7, 2, 1);
     public static final int V_6_2_0_ID = 6020099;
-    public static final Version V_6_2_0 = new Version(V_6_2_0_ID, LUCENE_7_2_1);
+    public static final Version V_6_2_0 = new Version(V_6_2_0_ID, org.apache.lucene.util.Version.LUCENE_7_2_1);
     public static final int V_6_2_1_ID = 6020199;
-    public static final Version V_6_2_1 = new Version(V_6_2_1_ID, LUCENE_7_2_1);
+    public static final Version V_6_2_1 = new Version(V_6_2_1_ID, org.apache.lucene.util.Version.LUCENE_7_2_1);
     public static final int V_6_2_2_ID = 6020299;
-    public static final Version V_6_2_2 = new Version(V_6_2_2_ID, LUCENE_7_2_1);
+    public static final Version V_6_2_2 = new Version(V_6_2_2_ID, org.apache.lucene.util.Version.LUCENE_7_2_1);
     public static final int V_6_2_3_ID = 6020399;
-    public static final Version V_6_2_3 = new Version(V_6_2_3_ID, LUCENE_7_2_1);
+    public static final Version V_6_2_3 = new Version(V_6_2_3_ID, org.apache.lucene.util.Version.LUCENE_7_2_1);
     public static final int V_6_2_4_ID = 6020499;
-    public static final Version V_6_2_4 = new Version(V_6_2_4_ID, LUCENE_7_2_1);
+    public static final Version V_6_2_4 = new Version(V_6_2_4_ID, org.apache.lucene.util.Version.LUCENE_7_2_1);
     public static final int V_6_3_0_ID = 6030099;
     public static final Version V_6_3_0 = new Version(V_6_3_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 {

test/framework/src/main/java/org/elasticsearch/indices/analysis/AnalysisFactoryTestCase.java

@@ -227,6 +227,8 @@ public abstract class AnalysisFactoryTestCase extends ESTestCase {
         // should we expose it, or maybe think about higher level integration of the
         // fake term frequency feature (LUCENE-7854)
         .put("delimitedtermfrequency",    Void.class)
+        // not exposed, only used internally to index shingles and speed up phrase queries
+        .put("fixedshingle", Void.class)
 
         .immutableMap();