Merge remote-tracking branch 'elastic/master' into more-snapshot-resiliency-testing-2

Author: original-brownbear

docs/plugins/plugin-script.asciidoc

@@ -5,7 +5,8 @@ The `plugin` script is used to install, list, and remove plugins. It is
 located in the `$ES_HOME/bin` directory by default but it may be in a
 different location depending on which Elasticsearch package you installed:
 
-* {ref}/zip-targz.html#zip-targz-layout[Directory layout of `.zip` and `.tar.gz` archives]
+* {ref}/targz.html#targz-layout[Directory layout of `.tar.gz` archives]
+* {ref}/zip-windows.html#windows-layout[Directory layout of Windows `.zip` archives]
 * {ref}/deb.html#deb-layout[Directory layout of Debian package]
 * {ref}/rpm.html#rpm-layout[Directory layout of RPM]
 
@@ -224,7 +225,8 @@ bin\elasticsearch-plugin install analysis-icu
 
 The default location of the `plugins` directory depends on which package you install:
 
-* {ref}/zip-targz.html#zip-targz-layout[Directory layout of `.zip` and `.tar.gz` archives]
+* {ref}/targz.html#targz-layout[Directory layout of `.tar.gz` archives]
+* {ref}/zip-windows.html#windows-layout[Directory layout of Windows `.zip` archives]
 * {ref}/deb.html#deb-layout[Directory layout of Debian package]
 * {ref}/rpm.html#rpm-layout[Directory layout of RPM]
 

libs/x-content/src/test/java/org/elasticsearch/common/xcontent/XContentParserTests.java

@@ -20,7 +20,6 @@
 package org.elasticsearch.common.xcontent;
 
 import com.fasterxml.jackson.core.JsonParseException;
-
 import org.elasticsearch.common.CheckedSupplier;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.bytes.BytesReference;
@@ -369,7 +368,6 @@ public void testSubParserObject() throws IOException {
         }
     }
 
-    @AwaitsFix(bugUrl="https://github.com/elastic/elasticsearch/issues/40617")
     public void testSubParserArray() throws IOException {
         XContentBuilder builder = XContentFactory.jsonBuilder();
         int numberOfArrayElements = randomInt(10);
@@ -378,7 +376,7 @@ public void testSubParserArray() throws IOException {
         builder.startArray();
         int numberOfTokens = 0;
         for (int i = 0; i < numberOfArrayElements; ++i) {
-            numberOfTokens += generateRandomObjectForMarking(builder);
+            numberOfTokens += generateRandomObject(builder, 0);
         }
         builder.endArray();
         builder.endObject();
@@ -392,7 +390,7 @@ public void testSubParserArray() throws IOException {
             assertEquals(XContentParser.Token.START_ARRAY, parser.nextToken()); // [
             XContentParser subParser = new XContentSubParser(parser);
             try {
-                int tokensToSkip = randomInt(numberOfTokens - 1);
+                int tokensToSkip = randomInt(numberOfTokens);
                 for (int i = 0; i < tokensToSkip; i++) {
                     // Simulate incomplete parsing
                     assertNotNull(subParser.nextToken());

plugins/repository-hdfs/build.gradle

@@ -79,6 +79,7 @@ for (String fixtureName : ['hdfsFixture', 'haHdfsFixture', 'secureHdfsFixture',
     dependsOn project.configurations.hdfsFixture, project(':test:fixtures:krb5kdc-fixture').tasks.postProcessFixture
     executable = new File(project.runtimeJavaHome, 'bin/java')
     env 'CLASSPATH', "${ -> project.configurations.hdfsFixture.asPath }"
+    onlyIf {  project(':test:fixtures:krb5kdc-fixture').buildFixture.enabled }
     waitCondition = { fixture, ant ->
       // the hdfs.MiniHDFS fixture writes the ports file when
       // it's ready, so we can just wait for the file to exist

test/fixtures/hdfs-fixture/build.gradle

@@ -18,23 +18,10 @@
  */
 
 apply plugin: 'elasticsearch.build'
-apply plugin: 'elasticsearch.test.fixtures'
 
 dependencies {
   compile "org.apache.hadoop:hadoop-minicluster:2.8.1"
 }
 
-task syncClasses(type: Sync) {
-  from sourceSets.test.runtimeClasspath
-  into "${buildDir}/fixture"
-}
-
-preProcessFixture {
-  dependsOn syncClasses
-
-  doLast {
-    file("${buildDir}/shared").mkdirs()
-  }
-}
-
 unitTest.enabled = false
+thirdPartyAudit.enabled = false