diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 86146db87dbc1..a097c7e4962ac 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -934,6 +934,11 @@
+
+
+
+
+
@@ -1469,6 +1474,11 @@
+
+
+
+
+
@@ -3983,6 +3993,11 @@
+
+
+
+
+
@@ -3998,6 +4013,11 @@
+
+
+
+
+
diff --git a/plugins/repository-hdfs/build.gradle b/plugins/repository-hdfs/build.gradle
index 6436dd2969d6d..76b56a5acb6b9 100644
--- a/plugins/repository-hdfs/build.gradle
+++ b/plugins/repository-hdfs/build.gradle
@@ -130,11 +130,11 @@ tasks.named('javaRestTest').configure {
classpath = sourceSets.javaRestTest.runtimeClasspath + configurations.hdfsFixture3
}
-tasks.register("javaRestTestHdfs2", RestIntegTestTask) {
- description = "Runs rest tests against an elasticsearch cluster with HDFS version 2"
- testClassesDirs = sourceSets.javaRestTest.output.classesDirs
- classpath = sourceSets.javaRestTest.runtimeClasspath + configurations.hdfsFixture2
-}
+//tasks.register("javaRestTestHdfs2", RestIntegTestTask) {
+// description = "Runs rest tests against an elasticsearch cluster with HDFS version 2"
+// testClassesDirs = sourceSets.javaRestTest.output.classesDirs
+// classpath = sourceSets.javaRestTest.runtimeClasspath + configurations.hdfsFixture2
+//}
tasks.named('yamlRestTest').configure {
classpath = sourceSets.yamlRestTest.runtimeClasspath + configurations.hdfsFixture2
diff --git a/test/fixtures/hdfs-fixture/build.gradle b/test/fixtures/hdfs-fixture/build.gradle
index 1f5bc96c5585e..2f1ac93e470bf 100644
--- a/test/fixtures/hdfs-fixture/build.gradle
+++ b/test/fixtures/hdfs-fixture/build.gradle
@@ -182,6 +182,11 @@ dependencies {
hdfs3("org.eclipse.jetty:jetty-http:9.4.40.v20210413")
hdfs3("org.eclipse.jetty:jetty-security:9.4.40.v20210413")
hdfs3("org.eclipse.jetty:jetty-io:9.4.40.v20210413")
+ hdfs3("org.eclipse.jetty:jetty-xml:9.4.40.v20210413")
+ hdfs3("commons-daemon:commons-daemon:1.4.0")
+ hdfs3("com.google.protobuf:protobuf-java:4.32.0")
+ hdfs3("com.google.re2j:re2j:1.0")
+ hdfs3("org.apache.commons:commons-math3:3.6.1")
hdfs3("javax.servlet:javax.servlet-api:3.1.0")
hdfs3("com.sun.jersey:jersey-servlet:1.19")
}
diff --git a/test/fixtures/hdfs-fixture/src/main/java/org/elasticsearch/test/fixtures/hdfs/HdfsFixture.java b/test/fixtures/hdfs-fixture/src/main/java/org/elasticsearch/test/fixtures/hdfs/HdfsFixture.java
index c61f4a0d89bb1..b5ecb3e8713d0 100644
--- a/test/fixtures/hdfs-fixture/src/main/java/org/elasticsearch/test/fixtures/hdfs/HdfsFixture.java
+++ b/test/fixtures/hdfs-fixture/src/main/java/org/elasticsearch/test/fixtures/hdfs/HdfsFixture.java
@@ -199,7 +199,7 @@ private void startMinHdfs() throws Exception {
// If the maximum number of attempts is reached, rethrow the exception
FileUtils.deleteDirectory(baseDir.toFile());
if (attempt == maxAttempts) {
- Assume.assumeTrue("Unable to start HDFS cluster", false);
+ throw e;
}
}
}
diff --git a/test/fixtures/krb5kdc-fixture/src/main/java/org/elasticsearch/test/fixtures/krb5kdc/Krb5kDcContainer.java b/test/fixtures/krb5kdc-fixture/src/main/java/org/elasticsearch/test/fixtures/krb5kdc/Krb5kDcContainer.java
index d71b4eab8e0fa..fc1d14c8cbbb6 100644
--- a/test/fixtures/krb5kdc-fixture/src/main/java/org/elasticsearch/test/fixtures/krb5kdc/Krb5kDcContainer.java
+++ b/test/fixtures/krb5kdc-fixture/src/main/java/org/elasticsearch/test/fixtures/krb5kdc/Krb5kDcContainer.java
@@ -88,7 +88,7 @@ public Krb5kDcContainer(ProvisioningId provisioningId) {
// Add previous port bindings and UDP port binding
Ports ports = cmd.getPortBindings();
- ports.bind(ExposedPort.udp(88), Ports.Binding.empty());
+ ports.bind(ExposedPort.udp(88), Ports.Binding.bindPort(88));
cmd.withPortBindings(ports);
});
withNetworkAliases("kerberos.build.elastic.co", "build.elastic.co");
diff --git a/x-pack/plugin/searchable-snapshots/qa/hdfs/build.gradle b/x-pack/plugin/searchable-snapshots/qa/hdfs/build.gradle
index 9c574edcf36fa..211aae65cfbda 100644
--- a/x-pack/plugin/searchable-snapshots/qa/hdfs/build.gradle
+++ b/x-pack/plugin/searchable-snapshots/qa/hdfs/build.gradle
@@ -12,7 +12,7 @@ apply plugin: 'elasticsearch.internal-available-ports'
configurations {
javaRestTestRuntimeClasspath {
attributes {
- attribute(Attribute.of('hdfs.major.version', Integer), 2)
+ attribute(Attribute.of('hdfs.major.version', Integer), 3)
}
}
}