Skip to content

Commit 5f9a4d8

Browse files
breskebybreskeby
authored
[9.1] Update test container version to 2.0.2 (#138622) (#138872)
* Update test container version to 2.0.2 (#138622) - Wrap fixture for junit4 support - Fix kerberos tests after testcontainer update * Make DockerEnvironmentAwareTestContainer instantiable to be usable as is. * Improve stability in hdfs tests by - Fix unable to load iage for hdfs fixture - Print stacktrace for cleanup exception in hdfsfixture to simplify debugging cleanup failures - Fix potential issue in hdfs cluster when using in parallel - running with custom Locale settings (cherry picked from commit 27ab591) # Conflicts: # gradle/verification-metadata.xml * Update verification metadata
1 parent a1c2020 commit 5f9a4d8

File tree

16 files changed

+421
-93
lines changed

16 files changed

+421
-93
lines changed

‎build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/dependencies/rules/ComponentMetadataRulesPlugin.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,6 @@ public void apply(Settings settings) {
194194
components.withModule("org.apache.arrow:arrow-vector", ExcludeAllTransitivesRule.class);
195195

196196
// Apache Commons dependencies
197-
components.withModule("org.apache.commons:commons-compress", ExcludeAllTransitivesRule.class);
198197
components.withModule("org.apache.commons:commons-text", ExcludeAllTransitivesRule.class);
199198

200199
// org.apache.directory.api:api-asn1-ber brings in org.slf4j:slf4j-api:1.7.25. We use 2.0.6
@@ -458,9 +457,6 @@ public void apply(Settings settings) {
458457
// SubEtha SMTP dependencies
459458
components.withModule("org.subethamail:subethasmtp", ExcludeAllTransitivesRule.class);
460459

461-
// Testcontainers dependencies
462-
components.withModule("org.testcontainers:testcontainers", ExcludeAllTransitivesRule.class);
463-
464460
// AWS SDK dependencies
465461
components.withModule("software.amazon.awssdk:apache-client", ExcludeAllTransitivesRule.class);
466462
components.withModule("software.amazon.awssdk:arns", ExcludeAllTransitivesRule.class);

‎build-tools-internal/version.properties‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,7 @@ mocksocket = 1.2
4444
apache_mina = 2.2.4
4545

4646
# test container dependencies
47-
testcontainer = 1.19.2
48-
dockerJava = 3.3.4
49-
ductTape = 1.0.8
50-
commonsCompress = 1.24.0
47+
testcontainer = 2.0.2
5148

5249
# packer caching build logic
5350
reflections = 0.10.2

‎gradle/verification-metadata.xml‎

Lines changed: 84 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,11 @@
297297
<sha256 value="91adcd3dcf5fd9a16499934e7536a23d456692a0093e3d4fd52f138c3936348c" origin="Generated by Gradle"/>
298298
</artifact>
299299
</component>
300+
<component group="com.fasterxml.jackson.core" name="jackson-annotations" version="2.20">
301+
<artifact name="jackson-annotations-2.20.jar">
302+
<sha256 value="959a2ffb2d591436f51f183c6a521fc89347912f711bf0cae008cdf045d95319" origin="Generated by Gradle"/>
303+
</artifact>
304+
</component>
300305
<component group="com.fasterxml.jackson.core" name="jackson-core" version="2.10.5">
301306
<artifact name="jackson-core-2.10.5.jar">
302307
<sha256 value="2656010d1e921ac69b76fc7e0c0f5a6b14aca62fa9603e78831e6148eb7c77ba" origin="Generated by Gradle"/>
@@ -457,24 +462,24 @@
457462
<sha256 value="81266920a1cdc47306a8a2b4726c99ec89b3fbf31c2470e4f5e477d9d857ca9f" origin="Generated by Gradle"/>
458463
</artifact>
459464
</component>
460-
<component group="com.github.docker-java" name="docker-java-api" version="3.3.4">
461-
<artifact name="docker-java-api-3.3.4.jar">
462-
<sha256 value="650710c70160c1c651e4586a07e55c5f564436cf1f28d83737265ceb5d67696f" origin="Generated by Gradle"/>
465+
<component group="com.github.docker-java" name="docker-java-api" version="3.7.0">
466+
<artifact name="docker-java-api-3.7.0.jar">
467+
<sha256 value="4c157ca47f8f14a28055ff7b3232940f226fcb6d415ba21f96a8cd1c2b7707c9" origin="Generated by Gradle"/>
463468
</artifact>
464469
</component>
465470
<component group="com.github.docker-java" name="docker-java-core" version="3.3.4">
466471
<artifact name="docker-java-core-3.3.4.jar">
467472
<sha256 value="5e2e2b3f3e4d2f1aa954f9a29762c4301bb75b8e6acdf2437771b91aa63622c2" origin="Generated by Gradle"/>
468473
</artifact>
469474
</component>
470-
<component group="com.github.docker-java" name="docker-java-transport" version="3.3.4">
471-
<artifact name="docker-java-transport-3.3.4.jar">
472-
<sha256 value="d4a0f11c6f95dfa5407c3418ef5fb59a6e985542abda3f6175f763e46daa12bd" origin="Generated by Gradle"/>
475+
<component group="com.github.docker-java" name="docker-java-transport" version="3.7.0">
476+
<artifact name="docker-java-transport-3.7.0.jar">
477+
<sha256 value="303ec4bf06b7c3c659e24d337b644d561d78139cfba3c7ab5011545a6d11e5ea" origin="Generated by Gradle"/>
473478
</artifact>
474479
</component>
475-
<component group="com.github.docker-java" name="docker-java-transport-zerodep" version="3.3.4">
476-
<artifact name="docker-java-transport-zerodep-3.3.4.jar">
477-
<sha256 value="78ca58ac36881034d230a6d47959ae8dc4762ee6ca5cd36b1ee6a10e8fd18d29" origin="Generated by Gradle"/>
480+
<component group="com.github.docker-java" name="docker-java-transport-zerodep" version="3.7.0">
481+
<artifact name="docker-java-transport-zerodep-3.7.0.jar">
482+
<sha256 value="61cd38171e175f884c3512d3e98e3e6004d314198861c84e8f837b30acd15026" origin="Generated by Gradle"/>
478483
</artifact>
479484
</component>
480485
<component group="com.github.javaparser" name="javaparser-core" version="3.18.0">
@@ -882,11 +887,53 @@
882887
<sha256 value="8540247fad9e06baefa8fb45eb313802d019f485f14300e0f9d6b556ed88e753" origin="Generated by Gradle"/>
883888
</artifact>
884889
</component>
890+
<component group="com.google.protobuf" name="protobuf-java" version="4.32.0">
891+
<artifact name="protobuf-java-4.32.0.jar">
892+
<sha256 value="e902c91b454812b7d056b8d303a572733bf0587576ff157c1049116c9626241d" origin="Generated by Gradle"/>
893+
</artifact>
894+
</component>
885895
<component group="com.google.protobuf" name="protobuf-java-util" version="3.25.5">
886896
<artifact name="protobuf-java-util-3.25.5.jar">
887897
<sha256 value="dacc58b2c3d2fa8d4bddc1acb881e78d6cf7c137dd78bc1d67f6aca732436a8d" origin="Generated by Gradle"/>
888898
</artifact>
889899
</component>
900+
<component group="com.google.protobuf" name="protoc" version="4.32.0">
901+
<artifact name="protoc-4.32.0-linux-aarch_64.exe">
902+
<sha256 value="bc95ab180ef088eed3f97c30b213ac6439ccac01989d18f9e908eb5233432136" origin="Generated by Gradle"/>
903+
</artifact>
904+
<artifact name="protoc-4.32.0-linux-ppcle_64.exe">
905+
<sha256 value="37d1c923270dcea474423994cae32e127d9aeb0cf97d40ccf652bd671358dc74" origin="Generated by Gradle"/>
906+
</artifact>
907+
<artifact name="protoc-4.32.0-linux-s390_64.exe">
908+
<sha256 value="0b97e27d36456e8a29855f10e6dfacd27043131d44bed460b921641c7201ec0a" origin="Generated by Gradle"/>
909+
</artifact>
910+
<artifact name="protoc-4.32.0-linux-x86_32.exe">
911+
<sha256 value="75abfd89ae91a12cfbd40fe9aca20a698cc6134fbc7bef999f5c8f3b8c604b13" origin="Generated by Gradle"/>
912+
</artifact>
913+
<artifact name="protoc-4.32.0-linux-x86_64.exe">
914+
<sha256 value="373c7da2c1cae98ac1a494a8a53e28100af70450ab55c064daa92ba48af5fe23" origin="Generated by Gradle"/>
915+
</artifact>
916+
<artifact name="protoc-4.32.0-osx-aarch_64.exe">
917+
<sha256 value="96c06aac6eb7e247a78f2ffe8b3aaf4419a6765e3d96d724cc3db0e296e7aa94" origin="Generated by Gradle"/>
918+
</artifact>
919+
<artifact name="protoc-4.32.0-osx-universal_binary.exe">
920+
<sha256 value="35f98ecc7c0efeb7d63427a6f3b9f7f2adc9f59d79275c3f0ae87030876c187c" origin="Generated by Gradle"/>
921+
</artifact>
922+
<artifact name="protoc-4.32.0-osx-x86_64.exe">
923+
<sha256 value="91b2b3b5ad84cfed2869c69830c926130d312e357b4f128796504b5448a6534c" origin="Generated by Gradle"/>
924+
</artifact>
925+
<artifact name="protoc-4.32.0-windows-x86_32.exe">
926+
<sha256 value="dc71390eb8a113f37a24275bc57cc59ddaceeac39b98af2181c94755f2f411f9" origin="Generated by Gradle"/>
927+
</artifact>
928+
<artifact name="protoc-4.32.0-windows-x86_64.exe">
929+
<sha256 value="a1e25d1b71e805233daefabba72a21566580354a192539cdab43bbf191dbf951" origin="Generated by Gradle"/>
930+
</artifact>
931+
</component>
932+
<component group="com.google.re2j" name="re2j" version="1.0">
933+
<artifact name="re2j-1.0.jar">
934+
<sha256 value="5406ddfec247c0db50a11b2fe6f4d881980fc3b2c3d03fce7b258c4b014be3e0" origin="Generated by Gradle"/>
935+
</artifact>
936+
</component>
890937
<component group="com.google.re2j" name="re2j" version="1.1">
891938
<artifact name="re2j-1.1.jar">
892939
<sha256 value="24ada84d1b5de584e3e84b06f0c7dd562cee6eafe8dea8083bd8eb123823bbe7" origin="Generated by Gradle"/>
@@ -1417,6 +1464,16 @@
14171464
<sha256 value="fd63b583fd3e8baeae22efacbd5a4f91c1fd97f56248e62e2615efa7b81daeaa" origin="Generated by Gradle"/>
14181465
</artifact>
14191466
</component>
1467+
<component group="commons-daemon" name="commons-daemon" version="1.0.15">
1468+
<artifact name="commons-daemon-1.0.15.jar">
1469+
<sha256 value="61a8f2b067b3ae8b3684669509250faffedbcfabd50f055bbe60c3fd5f0eb01e" origin="Generated by Gradle"/>
1470+
</artifact>
1471+
</component>
1472+
<component group="commons-daemon" name="commons-daemon" version="1.4.0">
1473+
<artifact name="commons-daemon-1.4.0.jar">
1474+
<sha256 value="6b8e35b13f27f265fed0caa7c4ce9d13b790662af5f48cb7d41df394de759dbd" origin="Generated by Gradle"/>
1475+
</artifact>
1476+
</component>
14201477
<component group="commons-digester" name="commons-digester" version="1.8">
14211478
<artifact name="commons-digester-1.8.jar">
14221479
<sha256 value="05662373044f3dff112567b7bb5dfa1174e91e074c0c727b4412788013f49d56" origin="Generated by Gradle"/>
@@ -1900,6 +1957,11 @@
19001957
<sha256 value="91a814ac4f40d60dee91d842e1a8ad874c62197984403d0e3c30d39e55cf53b3" origin="Generated by Gradle"/>
19011958
</artifact>
19021959
</component>
1960+
<component group="net.java.dev.jna" name="jna" version="5.18.1">
1961+
<artifact name="jna-5.18.1.jar">
1962+
<sha256 value="260c4b1e22b1db9e110ee441c4f13ce115f841fa48c41d78750986214b395557" origin="Generated by Gradle"/>
1963+
</artifact>
1964+
</component>
19031965
<component group="net.java.dev.jna" name="jna" version="5.2.0">
19041966
<artifact name="jna-5.2.0.jar">
19051967
<sha256 value="0271ae7fc162a5e69c337f36d86fdb94a8a232c5c42a80d8a7424071addd1fdc" origin="Generated by Gradle"/>
@@ -4156,6 +4218,11 @@
41564218
<sha256 value="ace2a10dc8e2d5fd34925ecac03e4988b2c0f851650c94b8cef49ba1bd111478" origin="Generated by Gradle"/>
41574219
</artifact>
41584220
</component>
4221+
<component group="org.jetbrains" name="annotations" version="17.0.0">
4222+
<artifact name="annotations-17.0.0.jar">
4223+
<sha256 value="195fb0da046d55bb042e91543484cf1da68b02bb7afbfe031f229e45ac84b3f2" origin="Generated by Gradle"/>
4224+
</artifact>
4225+
</component>
41594226
<component group="org.jetbrains" name="annotations" version="20.1.0">
41604227
<artifact name="annotations-20.1.0.jar">
41614228
<sha256 value="edc8e3ec9796a5f41c1ae44b2d318507ee6ac1212f121d93d33699b3d0aff638" origin="Generated by Gradle"/>
@@ -4846,6 +4913,11 @@
48464913
<sha256 value="3624f8474c1af46d75f98bc097d7864a323c81b3808aa43689a6e1c601c027be" origin="Generated by Gradle"/>
48474914
</artifact>
48484915
</component>
4916+
<component group="org.slf4j" name="slf4j-api" version="1.7.36">
4917+
<artifact name="slf4j-api-1.7.36.jar">
4918+
<sha256 value="d3ef575e3e4979678dc01bf1dcce51021493b4d11fb7f1be8ad982877c16a1c0" origin="Generated by Gradle"/>
4919+
</artifact>
4920+
</component>
48494921
<component group="org.slf4j" name="slf4j-api" version="2.0.17">
48504922
<artifact name="slf4j-api-2.0.17.jar">
48514923
<sha256 value="7b751d952061954d5abfed7181c1f645d336091b679891591d63329c622eb832" origin="Generated by Gradle"/>
@@ -4911,9 +4983,9 @@
49114983
<sha256 value="5196a0da2c5a33d1a04e88fc7a9cc109501bc265b5bac8edd9984a1885070ad4" origin="Generated by Gradle"/>
49124984
</artifact>
49134985
</component>
4914-
<component group="org.testcontainers" name="testcontainers" version="1.19.2">
4915-
<artifact name="testcontainers-1.19.2.jar">
4916-
<sha256 value="0218fcbfe6358c99f2a12935858829ba86dcb092ce8ca9f58fd8401c3ca7a149" origin="Generated by Gradle"/>
4986+
<component group="org.testcontainers" name="testcontainers" version="2.0.2">
4987+
<artifact name="testcontainers-2.0.2.jar">
4988+
<sha256 value="edd5740fd67f1a1edd7dae4b08eef333c81cbe84a9d437f14ecdb9b82bc04688" origin="Generated by Gradle"/>
49174989
</artifact>
49184990
</component>
49194991
<component group="org.threeten" name="threetenbp" version="1.7.0">

‎plugins/repository-hdfs/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ tasks.register("javaRestTestHdfs2", RestIntegTestTask) {
137137
}
138138

139139
tasks.named('yamlRestTest').configure {
140-
classpath = sourceSets.yamlRestTest.runtimeClasspath + configurations.hdfsFixture2
140+
classpath = sourceSets.yamlRestTest.runtimeClasspath + configurations.hdfsFixture3
141141
}
142142

143143
tasks.register("yamlRestTestHdfs2", RestIntegTestTask) {

‎test/fixtures/hdfs-fixture/build.gradle‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ dependencies {
156156
hdfs2("org.apache.hadoop:hadoop-annotations:2.8.5")
157157
hdfs2("org.apache.hadoop:hadoop-hdfs-client:2.8.5")
158158
hdfs2("org.apache.hadoop:hadoop-minicluster:2.8.5")
159+
hdfs2("commons-daemon:commons-daemon:1.0.15")
159160

160161
hdfs3("org.apache.hadoop:hadoop-minicluster:3.3.1")
161162
hdfs3("org.apache.hadoop:hadoop-common:3.3.1")
@@ -172,6 +173,11 @@ dependencies {
172173
hdfs3("commons-io:commons-io:2.8.0")
173174
hdfs3("org.apache.commons:commons-configuration2:2.1.1")
174175
hdfs3("org.apache.commons:commons-lang3:3.7")
176+
hdfs3("org.eclipse.jetty:jetty-xml:9.4.40.v20210413")
177+
hdfs3("commons-daemon:commons-daemon:1.4.0")
178+
hdfs3("com.google.protobuf:protobuf-java:4.32.0")
179+
hdfs3("com.google.re2j:re2j:1.0")
180+
hdfs3("org.apache.commons:commons-math3:3.6.1")
175181
hdfs3("org.apache.commons:commons-text:1.4")
176182
hdfs3("com.fasterxml.woodstox:woodstox-core:6.7.0")
177183
hdfs3("org.codehaus.woodstox:stax2-api:4.2.2")
@@ -206,12 +212,28 @@ def hdfs2Jar = tasks.register("hdfs2jar", ShadowJar) {
206212
archiveClassifier.set("hdfs2")
207213
from sourceSets.main.output
208214
configurations.add(project.configurations.hdfs2)
215+
216+
// Rename webapps directories for Hadoop 2.x compatibility with Jetty 6
217+
// Jetty 6 expects webapps/{name}/{name} structure
218+
eachFile { fileCopyDetails ->
219+
def pathStr = fileCopyDetails.path
220+
if (pathStr.startsWith("webapps/hdfs/") && !pathStr.startsWith("webapps/hdfs/hdfs/")) {
221+
fileCopyDetails.path = pathStr.replace("webapps/hdfs/", "webapps/hdfs/hdfs/")
222+
} else if (pathStr.startsWith("webapps/datanode/") && !pathStr.startsWith("webapps/datanode/datanode/")) {
223+
fileCopyDetails.path = pathStr.replace("webapps/datanode/", "webapps/datanode/datanode/")
224+
} else if (pathStr.startsWith("webapps/secondary/") && !pathStr.startsWith("webapps/secondary/secondary/")) {
225+
fileCopyDetails.path = pathStr.replace("webapps/secondary/", "webapps/secondary/secondary/")
226+
} else if (pathStr.startsWith("webapps/journal/") && !pathStr.startsWith("webapps/journal/journal/")) {
227+
fileCopyDetails.path = pathStr.replace("webapps/journal/", "webapps/journal/journal/")
228+
}
229+
}
209230
}
210231

211232
tasks.withType(ShadowJar).configureEach {
212233
dependencies {
213234
exclude(dependency("com.carrotsearch.randomizedtesting:randomizedtesting-runner:.*"))
214235
exclude(dependency("junit:junit:.*"))
236+
exclude(dependency("org.slf4j:slf4j-api:.*"))
215237
exclude(dependency("org.apache.httpcomponents:httpcore:.*"))
216238
exclude(dependency("org.apache.logging.log4j:log4j-1.2-api:.*"))
217239
exclude(dependency("net.java.dev.jna:jna:.*"))
@@ -232,6 +254,9 @@ tasks.withType(ShadowJar).configureEach {
232254
resource = "hdfs-default.xml"
233255
enabled = true
234256
}
257+
258+
relocate("org.apache.commons.lang", "fixture.org.apache.commons.lang")
259+
relocate("org.apache.commons.io", "fixture.org.apache.commons.io")
235260
}
236261

237262
artifacts {

0 commit comments

Comments
 (0)