Merge branch 'master' into feature/extensible-values-source

Author: not-napoleon

.ci/dockerOnLinuxExclusions

@@ -4,9 +4,7 @@
 # Docker tests to be skipped on that OS. If /etc/os-release doesn't exist
 # (as is the case on centos-6, for example) then that OS will again be
 # excluded.
-centos-6
 debian-8
 opensuse-15-1
-ol-6.10
 ol-7.7
 sles-12

README.asciidoc

@@ -192,7 +192,7 @@ In order to play with the distributed nature of Elasticsearch, simply bring more
 
 === Where to go from here?
 
-We have just covered a very small portion of what Elasticsearch is all about. For more information, please refer to the http://www.elastic.co/products/elasticsearch[elastic.co] website. General questions can be asked on the https://discuss.elastic.co[Elastic Forum] or https://ela.st/slack[on Slack]. The Elasticsearch GitHub repository is reserved for bug reports and feature requests only.
+We have just covered a very small portion of what Elasticsearch is all about. For more information, please refer to the https://www.elastic.co/products/elasticsearch[elastic.co] website. General questions can be asked on the https://discuss.elastic.co[Elastic Forum] or https://ela.st/slack[on Slack]. The Elasticsearch GitHub repository is reserved for bug reports and feature requests only.
 
 === Building from Source
 

TESTING.asciidoc

@@ -340,7 +340,8 @@ zip, and deb packages and all the plugins.  It will then run the tests on every
 available system. This will take a very long time.
 +
 Fortunately, the various systems under test have their own Gradle tasks under
-`qa/os`. To find out what packaging combinations can be tested on a system, run
+`qa/os`. To find the systems tested, do a listing of the `qa/os` directory.
+To find out what packaging combinations can be tested on a system, run
 the `tasks` task.  For example:
 +
 ----------------------------------
@@ -360,28 +361,7 @@ will remain running and you'll have to stop them manually with `./gradlew --stop
 
 All the regular vagrant commands should just work so you can get a shell in a
 VM running trusty by running
-`vagrant up ubuntu-1604 --provider virtualbox && vagrant ssh ubuntu-1604`.
-
-These are the linux flavors supported, all of which we provide images for
-
-* ubuntu-1604 aka xenial
-* ubuntu-1804 aka bionic beaver
-* debian-8 aka jessie
-* debian-9 aka stretch, the current debian stable distribution
-* centos-6
-* centos-7
-* rhel-8
-* fedora-28
-* fedora-29
-* oel-6 aka Oracle Enterprise Linux 6
-* oel-7 aka Oracle Enterprise Linux 7
-* sles-12
-* opensuse-42 aka Leap
-
-We're missing the following from the support matrix because there aren't high
-quality boxes available in vagrant atlas:
-
-* sles-11
+`vagrant up ubuntu-1804 --provider virtualbox && vagrant ssh ubuntu-1804`.
 
 === Testing packaging on Windows
 

build.gradle

@@ -84,7 +84,7 @@ subprojects {
 
             Node developer = node.appendNode('developers').appendNode('developer')
             developer.appendNode('name', 'Elastic')
-            developer.appendNode('url', 'http://www.elastic.co')
+            developer.appendNode('url', 'https://www.elastic.co')
           }
         }
       }
@@ -215,8 +215,8 @@ task verifyVersions {
  * after the backport of the backcompat code is complete.
  */
 
-boolean bwc_tests_enabled = true
-final String bwc_tests_disabled_issue = "" /* place a PR link here when committing bwc changes */
+boolean bwc_tests_enabled = false
+final String bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/pull/51875" /* place a PR link here when committing bwc changes */
 if (bwc_tests_enabled == false) {
   if (bwc_tests_disabled_issue.isEmpty()) {
     throw new GradleException("bwc_tests_disabled_issue must be set when bwc_tests_enabled == false")

buildSrc/src/main/groovy/org/elasticsearch/gradle/test/AntFixture.groovy

@@ -25,9 +25,7 @@ import org.elasticsearch.gradle.LoggedExec
 import org.gradle.api.GradleException
 import org.gradle.api.Task
 import org.gradle.api.tasks.Exec
-import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.Internal
-
 /**
  * A fixture for integration tests which runs in a separate process launched by Ant.
  */

buildSrc/src/main/java/org/elasticsearch/gradle/test/DistroTestPlugin.java

@@ -110,7 +110,7 @@ public void apply(Project project) {
 
         TaskProvider<Task> destructiveDistroTest = project.getTasks().register("destructiveDistroTest");
         for (ElasticsearchDistribution distribution : distributions) {
-            if (distribution.getType() != Type.DOCKER || runDockerTests == true) {
+            if (distribution.getType() != Type.DOCKER || runDockerTests) {
                 TaskProvider<?> destructiveTask = configureDistroTest(project, distribution);
                 destructiveDistroTest.configure(t -> t.dependsOn(destructiveTask));
             }
@@ -153,7 +153,7 @@ public void apply(Project project) {
                         //
                         // The shouldTestDocker property could be null, hence we use Boolean.TRUE.equals()
                         boolean shouldExecute = distribution.getType() != Type.DOCKER
-                            || Boolean.TRUE.equals(vmProject.findProperty("shouldTestDocker")) == true;
+                            || Boolean.TRUE.equals(vmProject.findProperty("shouldTestDocker"));
 
                         if (shouldExecute) {
                             t.dependsOn(vmTask);

buildSrc/src/main/java/org/elasticsearch/gradle/tool/DockerUtils.java

@@ -53,19 +53,19 @@ private static DockerAvailability getDockerAvailability(Project project) {
             // Since we use a multi-stage Docker build, check the Docker version since 17.05
             lastResult = runCommand(project, dockerPath, "version", "--format", "{{.Server.Version}}");
 
-            if (lastResult.isSuccess() == true) {
+            if (lastResult.isSuccess()) {
                 version = Version.fromString(lastResult.stdout.trim(), Version.Mode.RELAXED);
 
                 isVersionHighEnough = version.onOrAfter("17.05.0");
 
-                if (isVersionHighEnough == true) {
+                if (isVersionHighEnough) {
                     // Check that we can execute a privileged command
                     lastResult = runCommand(project, dockerPath, "images");
                 }
             }
         }
 
-        boolean isAvailable = isVersionHighEnough && lastResult.isSuccess() == true;
+        boolean isAvailable = isVersionHighEnough && lastResult.isSuccess();
 
         return new DockerAvailability(isAvailable, isVersionHighEnough, dockerPath, version, lastResult);
     }
@@ -125,7 +125,7 @@ private static class DockerAvailability {
     public static void assertDockerIsAvailable(Project project, List<String> tasks) {
         DockerAvailability availability = getDockerAvailability(project);
 
-        if (availability.isAvailable == true) {
+        if (availability.isAvailable) {
             return;
         }
 
@@ -146,17 +146,7 @@ public static void assertDockerIsAvailable(Project project, List<String> tasks)
             throwDockerRequiredException(message);
         }
 
-        if (availability.version == null) {
-            final String message = String.format(
-                Locale.ROOT,
-                "Docker is required to run the following task%s, but it doesn't appear to be running: \n%s",
-                tasks.size() > 1 ? "s" : "",
-                String.join("\n", tasks)
-            );
-            throwDockerRequiredException(message);
-        }
-
-        if (availability.isVersionHighEnough == false) {
+        if (availability.lastCommand.isSuccess() && availability.isVersionHighEnough == false) {
             final String message = String.format(
                 Locale.ROOT,
                 "building Docker images requires Docker version 17.05+ due to use of multi-stage builds yet was [%s]",
@@ -168,9 +158,10 @@ public static void assertDockerIsAvailable(Project project, List<String> tasks)
         // Some other problem, print the error
         final String message = String.format(
             Locale.ROOT,
-            "a problem occurred running Docker from [%s] yet it is required to run the following task%s: \n%s\n"
-                + "the problem is that Docker exited with exit code [%d] with standard error output [%s]",
+            "a problem occurred while using Docker from [%s]%s yet it is required to run the following task%s: \n%s\n"
+                + "the problem is that Docker exited with exit code [%d] with standard error output:\n%s",
             availability.path,
+            availability.version == null ? "" : " v" + availability.version,
             tasks.size() > 1 ? "s" : "",
             String.join("\n", tasks),
             availability.lastCommand.exitCode,
@@ -213,8 +204,8 @@ private static Result runCommand(Project project, String... args) {
             spec.setCommandLine((Object[]) args);
             spec.setStandardOutput(stdout);
             spec.setErrorOutput(stderr);
+            spec.setIgnoreExitValue(true);
         });
-
         return new Result(execResult.getExitValue(), stdout.toString(), stderr.toString());
     }
 

buildSrc/src/main/resources/checkstyle.xml

@@ -18,7 +18,7 @@
     <property name="message" value="Empty javadoc comments are forbidden"/>
   </module>
 
-  <!-- 
+  <!--
     We include snippets that are wrapped in `// tag` and `// end` into the
     docs, stripping the leading spaces. If the context is wider than 76
     characters then it'll need to scroll. This fails the build if it sees
@@ -103,5 +103,31 @@
       <property name="ignoreComments" value="true" />
     </module>
     <!-- end Orwellian suppression of Serializable -->
+
+    <!-- Forbid equality comparisons with `true` -->
+    <module name="DescendantToken">
+      <property name="tokens" value="EQUAL"/>
+      <property name="limitedTokens" value="LITERAL_TRUE"/>
+      <property name="maximumNumber" value="0"/>
+      <property name="maximumDepth" value="1"/>
+      <message key="descendant.token.max" value="Do not check for equality with 'true', since it is implied"/>
+    </module>
+
+    <!-- Forbid using '!' for logical negations in favour of checking
+         against 'false' explicitly. -->
+    <!-- This is disabled for now because there are many, many violations,
+         hence the rule is reporting at the "warning" severity. -->
+
+    <!--
+    <module name="DescendantToken">
+      <property name="severity" value="warning"/>
+      <property name="tokens" value="EXPR"/>
+      <property name="limitedTokens" value="LNOT"/>
+      <property name="maximumNumber" value="0"/>
+      <property name="maximumDepth" value="1"/>
+      <message key="descendant.token.max" value="Do not negate boolean expressions with '!', but check explicitly with '== false' as it is more explicit"/>
+    </module>
+    -->
+
   </module>
 </module>

buildSrc/src/main/resources/fips_java.security

@@ -1,6 +1,7 @@
 security.provider.1=org.bouncycastle.jcajce.provider.BouncyCastleFipsProvider
 security.provider.2=org.bouncycastle.jsse.provider.BouncyCastleJsseProvider fips:BCFIPS
 security.provider.3=SUN
+security.provider.4=SunJGSS
 securerandom.source=file:/dev/urandom
 securerandom.strongAlgorithms=NativePRNGBlocking:SUN,DRBG:SUN
 securerandom.drbg.config=

buildSrc/src/main/resources/forbidden/jdk-signatures.txt

@@ -59,7 +59,7 @@ java.net.MulticastSocket#<init>(int)
 java.net.ServerSocket#<init>(int)
 java.net.ServerSocket#<init>(int,int)
 
-@defaultMessage use NetworkAddress format/formatAddress to print IP or IP+ports
+@defaultMessage use NetworkAddress format() to print IP or IP+ports
 java.net.InetAddress#toString()
 java.net.InetAddress#getHostAddress()
 java.net.Inet4Address#getHostAddress()

buildSrc/src/minimumRuntime/java/org/elasticsearch/gradle/Version.java

@@ -29,9 +29,9 @@ public enum Mode {
         RELAXED
     }
 
-    private static final Pattern pattern = Pattern.compile("(\\d)+\\.(\\d+)\\.(\\d+)(-alpha\\d+|-beta\\d+|-rc\\d+)?(-SNAPSHOT)?");
+    private static final Pattern pattern = Pattern.compile("(\\d+)\\.(\\d+)\\.(\\d+)(-alpha\\d+|-beta\\d+|-rc\\d+)?(-SNAPSHOT)?");
 
-    private static final Pattern relaxedPattern = Pattern.compile("(\\d)+\\.(\\d+)\\.(\\d+)(-[a-zA-Z0-9_]+)*?");
+    private static final Pattern relaxedPattern = Pattern.compile("(\\d+)\\.(\\d+)\\.(\\d+)(-[a-zA-Z0-9_]+)*?");
 
     public Version(int major, int minor, int revision) {
         Objects.requireNonNull(major, "major version can't be null");
@@ -60,7 +60,7 @@ public static Version fromString(final String s, final Mode mode) {
         Objects.requireNonNull(s);
         Matcher matcher = mode == Mode.STRICT ? pattern.matcher(s) : relaxedPattern.matcher(s);
         if (matcher.matches() == false) {
-            String expected = mode == Mode.STRICT == true
+            String expected = mode == Mode.STRICT
                 ? "major.minor.revision[-(alpha|beta|rc)Number][-SNAPSHOT]"
                 : "major.minor.revision[-extra]";
             throw new IllegalArgumentException("Invalid version format: '" + s + "'. Should be " + expected);

buildSrc/src/test/java/org/elasticsearch/gradle/VersionTests.java

@@ -38,6 +38,7 @@ public void testVersionParsing() {
         assertVersionEquals("5.1.2-rc3", 5, 1, 2);
         assertVersionEquals("6.1.2-SNAPSHOT", 6, 1, 2);
         assertVersionEquals("6.1.2-beta1-SNAPSHOT", 6, 1, 2);
+        assertVersionEquals("17.03.11", 17, 3, 11);
     }
 
     public void testRelaxedVersionParsing() {
@@ -46,6 +47,7 @@ public void testRelaxedVersionParsing() {
         assertVersionEquals("6.1.2-beta1-SNAPSHOT", 6, 1, 2, Version.Mode.RELAXED);
         assertVersionEquals("6.1.2-foo", 6, 1, 2, Version.Mode.RELAXED);
         assertVersionEquals("6.1.2-foo-bar", 6, 1, 2, Version.Mode.RELAXED);
+        assertVersionEquals("16.01.22", 16, 1, 22, Version.Mode.RELAXED);
     }
 
     public void testCompareWithStringVersions() {
@@ -91,6 +93,7 @@ public void testToString() {
 
     public void testCompareVersions() {
         assertEquals(0, new Version(7, 0, 0).compareTo(new Version(7, 0, 0)));
+        assertOrder(Version.fromString("19.0.1"), Version.fromString("20.0.3"));
     }
 
     public void testExceptionEmpty() {

buildSrc/version.properties

@@ -22,7 +22,7 @@ slf4j             = 1.6.2
 # when updating the JNA version, also update the version in buildSrc/build.gradle
 jna               = 4.5.1
 
-netty             = 4.1.43.Final
+netty             = 4.1.45.Final
 joda              = 2.10.4
 
 # when updating this version, you need to ensure compatibility with:
@@ -31,7 +31,7 @@ joda              = 2.10.4
 #  - x-pack/plugin/security
 bouncycastle      = 1.61
 # test dependencies
-randomizedrunner  = 2.7.4
+randomizedrunner  = 2.7.6
 junit             = 4.12
 httpclient        = 4.5.10
 httpcore          = 4.4.12