Merge branch 'ccr' into newSnapshotBetweenMinAndMaxSeqNo

* ccr: (110 commits)
  Use LF line endings in Painless generated files (elastic#26822)
  [DOCS] Added info about snapshotting your data before an upgrade.
  Add documentation about disabling `_field_names`. (elastic#26813)
  Remove UnsortedNumericDoubleValues (elastic#26817)
  Fix IndexOutOfBoundsException in histograms for NaN doubles (elastic#26787) (elastic#26856)
  [TEST] Added skipping the `headers` feature to the Bulk REST YAML test
  Update type-field.asciidoc
  Fix search_after with geo distance sorting (elastic#26891)
  Use proper logging placeholder for Netty logging
  Add Netty channel information on write and flush failure
  Remove deploying in JBoss documentation
  Document JVM option MaxFDLimit for macOS ()
  Add additional low-level logging handler ()
  Unwrap causes when maybe dying
  Change log level on write and flush failure to warn
  [TEST] add test to ensure legacy list syntax in yml works fine
  Bump BWC version for settings serialization to 6.1.0
  Removed void token filter entries and added two tests
  Added Bengali Analyzer to Elasticsearch with respect to the lucene update(PR#238)
  Fix toString() in SnapshotStatus (elastic#26852)
  ...

Author: jasontedor

CONTRIBUTING.md

@@ -64,6 +64,10 @@ Vagrant.configure(2) do |config|
     config.vm.box = "elastic/fedora-25-x86_64"
     dnf_common config
   end
+  config.vm.define "fedora-26" do |config|
+    config.vm.box = "elastic/fedora-26-x86_64"
+    dnf_common config
+  end
   config.vm.define "opensuse-42" do |config|
     config.vm.box = "elastic/opensuse-42-x86_64"
     opensuse_common config

TESTING.asciidoc

@@ -92,7 +92,7 @@ dependencies {
   compile 'com.netflix.nebula:gradle-info-plugin:3.0.3'
   compile 'org.eclipse.jgit:org.eclipse.jgit:3.2.0.201312181205-r'
   compile 'com.perforce:p4java:2012.3.551082' // THIS IS SUPPOSED TO BE OPTIONAL IN THE FUTURE....
-  compile 'de.thetaphi:forbiddenapis:2.3'
+  compile 'de.thetaphi:forbiddenapis:2.4.1'
   compile 'org.apache.rat:apache-rat:0.11'
   compile "org.elasticsearch:jna:4.4.0-1"
 }

Vagrantfile

@@ -20,6 +20,7 @@ class VagrantTestPlugin implements Plugin<Project> {
             'debian-8',
             'debian-9',
             'fedora-25',
+            'fedora-26',
             'oel-6',
             'oel-7',
             'opensuse-42',

buildSrc/build.gradle

@@ -1,16 +1,14 @@
 # When updating elasticsearch, please update 'rest' version in core/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy
 elasticsearch     = 7.0.0-alpha1
-lucene            = 7.0.0-snapshot-d94a5f0
+lucene            = 7.1.0-snapshot-f33ed4ba12a
 
 # optional dependencies
 spatial4j         = 0.6
 jts               = 1.13
 jackson           = 2.8.6
 snakeyaml         = 1.15
 # when updating log4j, please update also docs/java-api/index.asciidoc
-# when updating this version, please check if https://github.com/apache/logging-log4j2/pull/109 is released into the version that you are
-# bumping to; if it is, remove the assumeTrues in EvilLoggerTests
-log4j             = 2.9.0
+log4j             = 2.9.1
 slf4j             = 1.6.2
 
 # when updating the JNA version, also update the version in buildSrc/build.gradle

buildSrc/src/main/groovy/org/elasticsearch/gradle/vagrant/VagrantTestPlugin.groovy

@@ -33,6 +33,8 @@
 import org.apache.http.impl.nio.reactor.IOReactorConfig;
 import org.apache.http.message.BasicHeader;
 import org.apache.http.nio.entity.NStringEntity;
+import org.apache.http.ssl.SSLContextBuilder;
+import org.apache.http.ssl.SSLContexts;
 import org.apache.http.util.EntityUtils;
 import org.elasticsearch.client.HttpAsyncResponseConsumerFactory;
 import org.elasticsearch.client.Response;
@@ -47,9 +49,6 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.cert.CertificateException;
 import java.util.Collections;
 import java.util.Map;
 import java.util.concurrent.CountDownLatch;
@@ -258,7 +257,7 @@ public void onFailure(Exception exception) {
     }
 
     @SuppressWarnings("unused")
-    public void testCommonConfiguration() throws IOException, KeyStoreException, CertificateException, NoSuchAlgorithmException {
+    public void testCommonConfiguration() throws Exception {
         {
             //tag::rest-client-config-timeouts
             RestClientBuilder builder = RestClient.builder(new HttpHost("localhost", 9200))
@@ -318,13 +317,14 @@ public HttpAsyncClientBuilder customizeHttpClient(HttpAsyncClientBuilder httpCli
         {
             Path keyStorePath = Paths.get("");
             String keyStorePass = "";
-            final SSLContext sslContext = null;
             //tag::rest-client-config-encrypted-communication
-            KeyStore keystore = KeyStore.getInstance("jks");
+            KeyStore truststore = KeyStore.getInstance("jks");
             try (InputStream is = Files.newInputStream(keyStorePath)) {
-                keystore.load(is, keyStorePass.toCharArray());
+                truststore.load(is, keyStorePass.toCharArray());
             }
-            RestClientBuilder builder = RestClient.builder(new HttpHost("localhost", 9200))
+            SSLContextBuilder sslBuilder = SSLContexts.custom().loadTrustMaterial(truststore, null);
+            final SSLContext sslContext = sslBuilder.build();
+            RestClientBuilder builder = RestClient.builder(new HttpHost("localhost", 9200, "https"))
                     .setHttpClientConfigCallback(new RestClientBuilder.HttpClientConfigCallback() {
                         @Override
                         public HttpAsyncClientBuilder customizeHttpClient(HttpAsyncClientBuilder httpClientBuilder) {

buildSrc/version.properties

@@ -0,0 +1 @@
+894f96d677880d4ab834a1356f62b875e579caaa

client/rest/src/test/java/org/elasticsearch/client/documentation/RestClientDocumentation.java

@@ -0,0 +1 @@
+7a2999229464e7a324aa503c0a52ec0f05efe7bd

core/licenses/log4j-1.2-api-2.9.0.jar.sha1

@@ -0,0 +1 @@
+c041978c686866ee8534f538c6220238db3bb6be

core/licenses/log4j-1.2-api-2.9.1.jar.sha1

@@ -54,13 +54,14 @@ The KStem stemmer in
 was developed by Bob Krovetz and Sergio Guzman-Lara (CIIR-UMass Amherst)
 under the BSD-license.
 
-The Arabic,Persian,Romanian,Bulgarian, and Hindi analyzers (common) come with a default
+The Arabic,Persian,Romanian,Bulgarian, Hindi and Bengali analyzers (common) come with a default
 stopword list that is BSD-licensed created by Jacques Savoy.  These files reside in:
 analysis/common/src/resources/org/apache/lucene/analysis/ar/stopwords.txt,
 analysis/common/src/resources/org/apache/lucene/analysis/fa/stopwords.txt,
 analysis/common/src/resources/org/apache/lucene/analysis/ro/stopwords.txt,
 analysis/common/src/resources/org/apache/lucene/analysis/bg/stopwords.txt,
-analysis/common/src/resources/org/apache/lucene/analysis/hi/stopwords.txt
+analysis/common/src/resources/org/apache/lucene/analysis/hi/stopwords.txt,
+analysis/common/src/resources/org/apache/lucene/analysis/bn/stopwords.txt
 See http://members.unine.ch/jacques.savoy/clef/index.html.
 
 The German,Spanish,Finnish,French,Hungarian,Italian,Portuguese,Russian and Swedish light stemmers

core/licenses/log4j-api-2.9.0.jar.sha1

@@ -0,0 +1 @@
+a59ac3bdd17becc848f319fb77994060661c2c71

core/licenses/log4j-api-2.9.1.jar.sha1

@@ -0,0 +1 @@
+47f560086db8683b5be26911fae3721d8b0da465

core/licenses/log4j-core-2.9.0.jar.sha1

@@ -0,0 +1 @@
+17bd8e886ac2e763c27a507e697f78e43103afd3

core/licenses/log4j-core-2.9.1.jar.sha1

@@ -0,0 +1 @@
+bb7d5f5f6dd0bada3991828b8687a35c90de76ca

core/licenses/lucene-NOTICE.txt

@@ -0,0 +1 @@
+f024368b33bfb7c1589aaf424992e474c4e3be38

core/licenses/lucene-analyzers-common-7.0.0-snapshot-d94a5f0.jar.sha1

@@ -0,0 +1 @@
+7b525cb2e2c8403543fefc09b972c78b86d2f0da

core/licenses/lucene-analyzers-common-7.1.0-snapshot-f33ed4ba12a.jar.sha1

@@ -0,0 +1 @@
+61cc3ced15fa80d8f97affe0c8df9818eeb8af49

core/licenses/lucene-backward-codecs-7.0.0-snapshot-d94a5f0.jar.sha1

@@ -0,0 +1 @@
+03a71b5875d25576c9f8992822db65fb181f4328

core/licenses/lucene-backward-codecs-7.1.0-snapshot-f33ed4ba12a.jar.sha1

@@ -0,0 +1 @@
+9c07c15b2c6f8bd3d75e0f53fff5631f012bff98

core/licenses/lucene-core-7.0.0-snapshot-d94a5f0.jar.sha1

@@ -0,0 +1 @@
+e0a7815981d096d96e7dc41b1c063cd78c91132d

core/licenses/lucene-core-7.1.0-snapshot-f33ed4ba12a.jar.sha1

@@ -0,0 +1 @@
+1ea14867a6bc545fb2e09dd1f31b48523cdbc040

core/licenses/lucene-grouping-7.0.0-snapshot-d94a5f0.jar.sha1

@@ -0,0 +1 @@
+58ce824ebc6126e37ff232c96a561a659377a873

core/licenses/lucene-grouping-7.1.0-snapshot-f33ed4ba12a.jar.sha1

@@ -0,0 +1 @@
+3fcd89a8cda5ee2049c189b06b5e30258b1aa198

core/licenses/lucene-highlighter-7.0.0-snapshot-d94a5f0.jar.sha1

@@ -0,0 +1 @@
+1d1ada8fbb1b2bbbc88e9f29e28802a7b44a6665

core/licenses/lucene-highlighter-7.1.0-snapshot-f33ed4ba12a.jar.sha1

@@ -0,0 +1 @@
+fb7f18e6a81899e3ac95760b56bea21ebf143cf9

core/licenses/lucene-join-7.0.0-snapshot-d94a5f0.jar.sha1

@@ -93,11 +93,11 @@ public class Version implements Comparable<Version> {
     public static final int V_5_6_0_ID = 5060099;
     public static final Version V_5_6_0 = new Version(V_5_6_0_ID, org.apache.lucene.util.Version.LUCENE_6_6_0);
     public static final int V_5_6_1_ID = 5060199;
-    // TODO use proper Lucene constant once we are on a Lucene snapshot that knows about 6.6.1
-    public static final Version V_5_6_1 = new Version(V_5_6_1_ID, org.apache.lucene.util.Version.fromBits(6, 6, 1));
+    public static final Version V_5_6_1 = new Version(V_5_6_1_ID, org.apache.lucene.util.Version.LUCENE_6_6_1);
     public static final int V_5_6_2_ID = 5060299;
-    // TODO use proper Lucene constant once we are on a Lucene snapshot that knows about 6.6.1
-    public static final Version V_5_6_2 = new Version(V_5_6_2_ID, org.apache.lucene.util.Version.fromBits(6, 6, 1));
+    public static final Version V_5_6_2 = new Version(V_5_6_2_ID, org.apache.lucene.util.Version.LUCENE_6_6_1);
+    public static final int V_5_6_3_ID = 5060399;
+    public static final Version V_5_6_3 = new Version(V_5_6_3_ID, org.apache.lucene.util.Version.LUCENE_6_6_1);
     public static final int V_6_0_0_alpha1_ID = 6000001;
     public static final Version V_6_0_0_alpha1 =
             new Version(V_6_0_0_alpha1_ID, org.apache.lucene.util.Version.LUCENE_7_0_0);
@@ -113,12 +113,15 @@ public class Version implements Comparable<Version> {
     public static final int V_6_0_0_rc1_ID = 6000051;
     public static final Version V_6_0_0_rc1 =
         new Version(V_6_0_0_rc1_ID, org.apache.lucene.util.Version.LUCENE_7_0_0);
+    public static final int V_6_0_0_rc2_ID = 6000052;
+    public static final Version V_6_0_0_rc2 =
+        new Version(V_6_0_0_rc2_ID, org.apache.lucene.util.Version.LUCENE_7_0_0);
     public static final int V_6_1_0_ID = 6010099;
     public static final Version V_6_1_0 =
-        new Version(V_6_1_0_ID, org.apache.lucene.util.Version.LUCENE_7_0_0);
+        new Version(V_6_1_0_ID, org.apache.lucene.util.Version.LUCENE_7_1_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_0_0);
+        new Version(V_7_0_0_alpha1_ID, org.apache.lucene.util.Version.LUCENE_7_1_0);
     public static final Version CURRENT = V_7_0_0_alpha1;
 
     // unreleased versions must be added to the above list with the suffix _UNRELEASED (with the exception of CURRENT)
@@ -138,6 +141,8 @@ public static Version fromId(int id) {
                 return V_7_0_0_alpha1;
             case V_6_1_0_ID:
                 return V_6_1_0;
+            case V_6_0_0_rc2_ID:
+                return V_6_0_0_rc2;
             case V_6_0_0_beta2_ID:
                 return V_6_0_0_beta2;
             case V_6_0_0_rc1_ID:
@@ -148,6 +153,8 @@ public static Version fromId(int id) {
                 return V_6_0_0_alpha2;
             case V_6_0_0_alpha1_ID:
                 return V_6_0_0_alpha1;
+            case V_5_6_3_ID:
+                return V_5_6_3;
             case V_5_6_2_ID:
                 return V_5_6_2;
             case V_5_6_1_ID:

core/licenses/lucene-join-7.1.0-snapshot-f33ed4ba12a.jar.sha1

@@ -20,13 +20,12 @@
 package org.elasticsearch.action.admin.cluster.snapshots.status;
 
 import org.elasticsearch.cluster.SnapshotsInProgress.State;
+import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.io.stream.Streamable;
-import org.elasticsearch.common.xcontent.ToXContent.Params;
 import org.elasticsearch.common.xcontent.ToXContentObject;
 import org.elasticsearch.common.xcontent.XContentBuilder;
-import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.snapshots.Snapshot;
 
 import java.io.IOException;
@@ -160,15 +159,7 @@ public static SnapshotStatus readSnapshotStatus(StreamInput in) throws IOExcepti
 
     @Override
     public String toString() {
-        try {
-            XContentBuilder builder = XContentFactory.jsonBuilder().prettyPrint();
-            builder.startObject();
-            toXContent(builder, EMPTY_PARAMS);
-            builder.endObject();
-            return builder.string();
-        } catch (IOException e) {
-            return "{ \"error\" : \"" + e.getMessage() + "\"}";
-        }
+        return Strings.toString(this, true, false);
     }
 
     /**