Skip to content

Commit 2ae0556

Browse files
joegallojoegallo
authored
Bump junit and hamcrest (#126055) (#126062)
1 parent a532f7a commit 2ae0556

File tree

4 files changed

+58
-32
lines changed

4 files changed

+58
-32
lines changed

‎build-tools-internal/version.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ protobuf = 3.25.5
3838
# test dependencies
3939
randomizedrunner = 2.8.2
4040
junit = 4.13.2
41-
junit5 = 5.7.1
42-
hamcrest = 2.1
41+
junit5 = 5.12.1
42+
hamcrest = 3.0
4343
mocksocket = 1.2
4444

4545
# test container dependencies

‎gradle/build.versions.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[versions]
22
asm = "9.7.1"
33
jackson = "2.15.0"
4-
junit5 = "5.8.1"
4+
junit5 = "5.12.1"
55
spock = "2.1-groovy-3.0"
66

77
[libraries]
@@ -17,7 +17,7 @@ commmons-io = "commons-io:commons-io:2.2"
1717
docker-compose = "com.avast.gradle:gradle-docker-compose-plugin:0.17.5"
1818
forbiddenApis = "de.thetaphi:forbiddenapis:3.8"
1919
gradle-enterprise = "com.gradle:develocity-gradle-plugin:3.19.2"
20-
hamcrest = "org.hamcrest:hamcrest:2.1"
20+
hamcrest = "org.hamcrest:hamcrest:3.0"
2121
httpcore5 = "org.apache.httpcomponents.core5:httpcore5:5.3.3"
2222
httpclient5 = "org.apache.httpcomponents.client5:httpclient5:5.4.2"
2323
idea-ext = "gradle.plugin.org.jetbrains.gradle.plugin.idea-ext:gradle-idea-ext:1.1.4"

‎gradle/verification-metadata.xml

+52-27
Original file line numberDiff line numberDiff line change
@@ -1634,16 +1634,6 @@
16341634
<sha256 value="d65b4f127d36cf52b9b7b439552db22f3de92b892014512870cb3c98a3cf505e" origin="Generated by Gradle"/>
16351635
</artifact>
16361636
</component>
1637-
<component group="junit" name="junit" version="3.8.1">
1638-
<artifact name="junit-3.8.1.jar">
1639-
<sha256 value="b58e459509e190bed737f3592bc1950485322846cf10e78ded1d065153012d70" origin="Generated by Gradle"/>
1640-
</artifact>
1641-
</component>
1642-
<component group="junit" name="junit" version="4.12">
1643-
<artifact name="junit-4.12.jar">
1644-
<sha256 value="59721f0805e223d84b90677887d9ff567dc534d7c502ca903c0c2b17f05c116a" origin="Generated by Gradle"/>
1645-
</artifact>
1646-
</component>
16471637
<component group="junit" name="junit" version="4.13.2">
16481638
<artifact name="junit-4.13.2.jar">
16491639
<sha256 value="8e495b634469d64fb8acfa3495a065cbacc8a0fff55ce1e31007be4c16dc57d3" origin="Generated by Gradle"/>
@@ -3267,6 +3257,11 @@
32673257
<sha256 value="d749db58c2bd353f1c03541d747b753931d4b84da8e48993ef51efe8694b4ed7" origin="Generated by Gradle"/>
32683258
</artifact>
32693259
</component>
3260+
<component group="org.assertj" name="assertj-core" version="3.27.3">
3261+
<artifact name="assertj-core-3.27.3.jar">
3262+
<sha256 value="5b8a26205f6d5ea60ad9ce65ce4a40a2afe4c48abeec61bd0740a088c24e89f5" origin="Generated by Gradle"/>
3263+
</artifact>
3264+
</component>
32703265
<component group="org.bouncycastle" name="bc-fips" version="1.0.2.5">
32713266
<artifact name="bc-fips-1.0.2.5.jar">
32723267
<sha256 value="50e4c7a0d0c68413d3d8587560d56945ac09e7c89c41bd971cd22d76be6f1085" origin="Generated by Gradle"/>
@@ -3837,16 +3832,16 @@
38373832
<sha256 value="54045988848801e84cffd604cfd94f6e2a613248d81ca315c20e74d0ac3b602c" origin="Generated by Gradle"/>
38383833
</artifact>
38393834
</component>
3840-
<component group="org.hamcrest" name="hamcrest" version="2.1">
3841-
<artifact name="hamcrest-2.1.jar">
3842-
<sha256 value="ba93b2e3a562322ba432f0a1b53addcc55cb188253319a020ed77f824e692050" origin="Generated by Gradle"/>
3843-
</artifact>
3844-
</component>
38453835
<component group="org.hamcrest" name="hamcrest" version="2.2">
38463836
<artifact name="hamcrest-2.2.jar">
38473837
<sha256 value="5e62846a89f05cd78cd9c1a553f340d002458380c320455dd1f8fc5497a8a1c1" origin="Generated by Gradle"/>
38483838
</artifact>
38493839
</component>
3840+
<component group="org.hamcrest" name="hamcrest" version="3.0">
3841+
<artifact name="hamcrest-3.0.jar">
3842+
<sha256 value="5d66b6a4a680755cb6ed7cb104fa7835ef644667586ff0737adeb977c39ecdbc" origin="Generated by Gradle"/>
3843+
</artifact>
3844+
</component>
38503845
<component group="org.hamcrest" name="hamcrest-core" version="1.3">
38513846
<artifact name="hamcrest-core-1.3.jar">
38523847
<sha256 value="66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9" origin="Generated by Gradle"/>
@@ -3957,49 +3952,74 @@
39573952
<sha256 value="e2b99c0d2fa39f69f27efb1c0016390713feb2f2e02d8ea7f1c36b780271598a" origin="Generated by Gradle"/>
39583953
</artifact>
39593954
</component>
3955+
<component group="org.junit.jupiter" name="junit-jupiter" version="5.12.1">
3956+
<artifact name="junit-jupiter-5.12.1.jar">
3957+
<sha256 value="228a94c9ee743d55bfea09b57630681ea7b20a661a477447f5c1f60dc12d9e3a" origin="Generated by Gradle"/>
3958+
</artifact>
3959+
</component>
39603960
<component group="org.junit.jupiter" name="junit-jupiter" version="5.8.1">
39613961
<artifact name="junit-jupiter-5.8.1.jar">
39623962
<sha256 value="8f1049ee24b34a10b60cd810048099f781c2658cde2181e831496ab30a982985" origin="Generated by Gradle"/>
39633963
</artifact>
39643964
</component>
3965-
<component group="org.junit.jupiter" name="junit-jupiter-api" version="5.8.1">
3966-
<artifact name="junit-jupiter-api-5.8.1.jar">
3967-
<sha256 value="ce3374a7efba605e2d2b69a3fef90134032bab3ecc3ed8579a4871b1c2c4729c" origin="Generated by Gradle"/>
3965+
<component group="org.junit.jupiter" name="junit-jupiter-api" version="5.12.1">
3966+
<artifact name="junit-jupiter-api-5.12.1.jar">
3967+
<sha256 value="a401e0b60373edf7df0962c25eb3213e451a4778792d33a76876c3b8a5bb209b" origin="Generated by Gradle"/>
3968+
</artifact>
3969+
</component>
3970+
<component group="org.junit.jupiter" name="junit-jupiter-engine" version="5.12.1">
3971+
<artifact name="junit-jupiter-engine-5.12.1.jar">
3972+
<sha256 value="0e7f2dbeb91bfaeb0d4cb33a487351baf0e5a6ed72906154d8fd9975d329c592" origin="Generated by Gradle"/>
39683973
</artifact>
39693974
</component>
3970-
<component group="org.junit.jupiter" name="junit-jupiter-engine" version="5.8.1">
3971-
<artifact name="junit-jupiter-engine-5.8.1.jar">
3972-
<sha256 value="4689bc902255a19fe98277683ba3231c094d107c54c8d35f2b6f9c97d226418e" origin="Generated by Gradle"/>
3975+
<component group="org.junit.jupiter" name="junit-jupiter-params" version="5.12.1">
3976+
<artifact name="junit-jupiter-params-5.12.1.jar">
3977+
<sha256 value="5951706999e35951d4df0eca6e091d3619f659a9c10858f2f5a3ce191cb57673" origin="Generated by Gradle"/>
39733978
</artifact>
39743979
</component>
3975-
<component group="org.junit.jupiter" name="junit-jupiter-params" version="5.8.1">
3976-
<artifact name="junit-jupiter-params-5.8.1.jar">
3977-
<sha256 value="389b8d13a8d8872fcbd4f0eba7b2c46afc628419f9a1b2a3a9f93241a06a7218" origin="Generated by Gradle"/>
3980+
<component group="org.junit.platform" name="junit-platform-commons" version="1.12.1">
3981+
<artifact name="junit-platform-commons-1.12.1.jar">
3982+
<sha256 value="c316163581aaa5649280122b12ea36fe4e9c202a1a2267753fea7c9e1df055eb" origin="Generated by Gradle"/>
39783983
</artifact>
39793984
</component>
39803985
<component group="org.junit.platform" name="junit-platform-commons" version="1.8.1">
39813986
<artifact name="junit-platform-commons-1.8.1.jar">
39823987
<sha256 value="fa4fa68c8bd54dd0cb49c3fcbe9b2e42f4da6bedbe7e7ccf2a05f1a1e609b593" origin="Generated by Gradle"/>
39833988
</artifact>
39843989
</component>
3990+
<component group="org.junit.platform" name="junit-platform-engine" version="1.12.1">
3991+
<artifact name="junit-platform-engine-1.12.1.jar">
3992+
<sha256 value="7fedff93fd92aec7d29fc60dc01fa027246b36b8088423a5efc4949e5f6affa4" origin="Generated by Gradle"/>
3993+
</artifact>
3994+
</component>
39853995
<component group="org.junit.platform" name="junit-platform-engine" version="1.8.1">
39863996
<artifact name="junit-platform-engine-1.8.1.jar">
39873997
<sha256 value="702868ed7e86b9b4672ede0f1e185e905baca9afab57746a7c650be3c7bca047" origin="Generated by Gradle"/>
39883998
</artifact>
39893999
</component>
4000+
<component group="org.junit.platform" name="junit-platform-launcher" version="1.12.1">
4001+
<artifact name="junit-platform-launcher-1.12.1.jar">
4002+
<sha256 value="ebbb14e7b29f60730eaede862ed69d7de0d581ea0c038fa6a202955c7541f525" origin="Generated by Gradle"/>
4003+
</artifact>
4004+
</component>
39904005
<component group="org.junit.platform" name="junit-platform-launcher" version="1.8.1">
39914006
<artifact name="junit-platform-launcher-1.8.1.jar">
39924007
<sha256 value="83a9ed68adcb76e60316a4d682fc48507865df2f0ab35f82695cc9995410e05e" origin="Generated by Gradle"/>
39934008
</artifact>
39944009
</component>
4010+
<component group="org.junit.platform" name="junit-platform-testkit" version="1.12.1">
4011+
<artifact name="junit-platform-testkit-1.12.1.jar">
4012+
<sha256 value="40623b54782410e0855c543e0ff150d221ed3f77ed75693d66710640ec2271be" origin="Generated by Gradle"/>
4013+
</artifact>
4014+
</component>
39954015
<component group="org.junit.platform" name="junit-platform-testkit" version="1.8.1">
39964016
<artifact name="junit-platform-testkit-1.8.1.jar">
39974017
<sha256 value="38d6b8bdd3e5de159564bf33bd8918ce24baca57a84f1ea743f0074e4819e697" origin="Generated by Gradle"/>
39984018
</artifact>
39994019
</component>
4000-
<component group="org.junit.vintage" name="junit-vintage-engine" version="5.8.1">
4001-
<artifact name="junit-vintage-engine-5.8.1.jar">
4002-
<sha256 value="176b53cd1bdbf9233e96c8b0c7a9e5b864282fbbdeba43b5ceafdedb29a49156" origin="Generated by Gradle"/>
4020+
<component group="org.junit.vintage" name="junit-vintage-engine" version="5.12.1">
4021+
<artifact name="junit-vintage-engine-5.12.1.jar">
4022+
<sha256 value="9b93fb605b9fa0b750a69212a0141eb648c6c90f3b7f2c48dd8cdd2b72513109" origin="Generated by Gradle"/>
40034023
</artifact>
40044024
</component>
40054025
<component group="org.locationtech.jts" name="jts-core" version="1.15.0">
@@ -4242,6 +4262,11 @@
42424262
<sha256 value="58812de60898d976fb81ef3b62da05c6604c18fd4a249f5044282479fc286af2" origin="Generated by Gradle"/>
42434263
</artifact>
42444264
</component>
4265+
<component group="org.opentest4j" name="opentest4j" version="1.3.0">
4266+
<artifact name="opentest4j-1.3.0.jar">
4267+
<sha256 value="48e2df636cab6563ced64dcdff8abb2355627cb236ef0bf37598682ddf742f1b" origin="Generated by Gradle"/>
4268+
</artifact>
4269+
</component>
42454270
<component group="org.orbisgis" name="cts" version="1.5.2">
42464271
<artifact name="cts-1.5.2.jar">
42474272
<sha256 value="72f8b1fbb59fe777dd1cbd618d39e22ab28436fa0843979c6120bd6cd5833e0e" origin="Generated by Gradle"/>

‎server/src/internalClusterTest/java/org/elasticsearch/index/seqno/RetentionLeaseIT.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
import static org.hamcrest.Matchers.anyOf;
5454
import static org.hamcrest.Matchers.contains;
5555
import static org.hamcrest.Matchers.empty;
56+
import static org.hamcrest.Matchers.emptyIterable;
5657
import static org.hamcrest.Matchers.equalTo;
5758

5859
@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST)
@@ -229,7 +230,7 @@ public void testRetentionLeasesSyncOnExpiration() throws Exception {
229230
.getShardOrNull(new ShardId(resolveIndex("index"), 0));
230231
assertThat(
231232
RetentionLeaseUtils.toMapExcludingPeerRecoveryRetentionLeases(replica.getRetentionLeases()).values(),
232-
anyOf(empty(), contains(currentRetentionLease))
233+
anyOf(emptyIterable(), contains(currentRetentionLease))
233234
);
234235
}
235236

0 commit comments

Comments
 (0)