From 73cc95bcbf50c615962985eb2f13365a6f3dd6a0 Mon Sep 17 00:00:00 2001 From: Joe Gallo Date: Tue, 1 Apr 2025 12:22:14 -0400 Subject: [PATCH 1/5] Drop some old versions --- gradle/verification-metadata.xml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index b74cb96a8ed14..48cd158c5249b 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -1634,16 +1634,6 @@ - - - - - - - - - - From 853cad4b2efc04d8129dc9f16affef8116cfb66a Mon Sep 17 00:00:00 2001 From: Joe Gallo Date: Tue, 1 Apr 2025 12:23:40 -0400 Subject: [PATCH 2/5] Bump junit5 to 5.12.1 --- build-tools-internal/version.properties | 2 +- gradle/build.versions.toml | 2 +- gradle/verification-metadata.xml | 59 ++++++++++++++++++++----- 3 files changed, 49 insertions(+), 14 deletions(-) diff --git a/build-tools-internal/version.properties b/build-tools-internal/version.properties index b8ee6ca131ccf..81d72ca62b30b 100644 --- a/build-tools-internal/version.properties +++ b/build-tools-internal/version.properties @@ -38,7 +38,7 @@ protobuf = 3.25.5 # test dependencies randomizedrunner = 2.8.2 junit = 4.13.2 -junit5 = 5.7.1 +junit5 = 5.12.1 hamcrest = 2.1 mocksocket = 1.2 diff --git a/gradle/build.versions.toml b/gradle/build.versions.toml index 9b5230f7d47a1..69a4a8bdb7521 100644 --- a/gradle/build.versions.toml +++ b/gradle/build.versions.toml @@ -1,7 +1,7 @@ [versions] asm = "9.7.1" jackson = "2.15.0" -junit5 = "5.8.1" +junit5 = "5.12.1" spock = "2.1-groovy-3.0" [libraries] diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 48cd158c5249b..53fb2a008e495 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -3307,6 +3307,11 @@ + + + + + @@ -3997,24 +4002,34 @@ + + + + + - - - + + + - - - + + + - - - + + + + + + + + @@ -4022,24 +4037,39 @@ + + + + + + + + + + + + + + + - - - + + + @@ -4282,6 +4312,11 @@ + + + + + From c9ac7ed9f2a5488d69bc38525ec56b4e5a62d0ce Mon Sep 17 00:00:00 2001 From: Joe Gallo Date: Tue, 1 Apr 2025 12:29:11 -0400 Subject: [PATCH 3/5] Bump hamcrest to 2.2 --- build-tools-internal/version.properties | 2 +- gradle/build.versions.toml | 2 +- gradle/verification-metadata.xml | 5 ----- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/build-tools-internal/version.properties b/build-tools-internal/version.properties index 81d72ca62b30b..2761409cff0f4 100644 --- a/build-tools-internal/version.properties +++ b/build-tools-internal/version.properties @@ -39,7 +39,7 @@ protobuf = 3.25.5 randomizedrunner = 2.8.2 junit = 4.13.2 junit5 = 5.12.1 -hamcrest = 2.1 +hamcrest = 2.2 mocksocket = 1.2 # test container dependencies diff --git a/gradle/build.versions.toml b/gradle/build.versions.toml index 69a4a8bdb7521..0c5fad69e1d8c 100644 --- a/gradle/build.versions.toml +++ b/gradle/build.versions.toml @@ -17,7 +17,7 @@ commmons-io = "commons-io:commons-io:2.2" docker-compose = "com.avast.gradle:gradle-docker-compose-plugin:0.17.5" forbiddenApis = "de.thetaphi:forbiddenapis:3.8" gradle-enterprise = "com.gradle:develocity-gradle-plugin:3.19.2" -hamcrest = "org.hamcrest:hamcrest:2.1" +hamcrest = "org.hamcrest:hamcrest:2.2" httpcore5 = "org.apache.httpcomponents.core5:httpcore5:5.3.3" httpclient5 = "org.apache.httpcomponents.client5:httpclient5:5.4.2" idea-ext = "gradle.plugin.org.jetbrains.gradle.plugin.idea-ext:gradle-idea-ext:1.1.4" diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 53fb2a008e495..9875c196ef0f1 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -3882,11 +3882,6 @@ - - - - - From 9b4ac0c81d9ae64232a92ca7c357de2258a1cb9a Mon Sep 17 00:00:00 2001 From: Joe Gallo Date: Tue, 1 Apr 2025 12:31:02 -0400 Subject: [PATCH 4/5] Get this compiling again --- .../java/org/elasticsearch/index/seqno/RetentionLeaseIT.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/src/internalClusterTest/java/org/elasticsearch/index/seqno/RetentionLeaseIT.java b/server/src/internalClusterTest/java/org/elasticsearch/index/seqno/RetentionLeaseIT.java index 70689dc689673..1f0495a846fb8 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/index/seqno/RetentionLeaseIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/index/seqno/RetentionLeaseIT.java @@ -53,6 +53,7 @@ import static org.hamcrest.Matchers.anyOf; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.empty; +import static org.hamcrest.Matchers.emptyIterable; import static org.hamcrest.Matchers.equalTo; @ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST) @@ -229,7 +230,7 @@ public void testRetentionLeasesSyncOnExpiration() throws Exception { .getShardOrNull(new ShardId(resolveIndex("index"), 0)); assertThat( RetentionLeaseUtils.toMapExcludingPeerRecoveryRetentionLeases(replica.getRetentionLeases()).values(), - anyOf(empty(), contains(currentRetentionLease)) + anyOf(emptyIterable(), contains(currentRetentionLease)) ); } From 111d32ad3b1b7d612693df0629b670b4a60ef4bc Mon Sep 17 00:00:00 2001 From: Joe Gallo Date: Tue, 1 Apr 2025 12:36:13 -0400 Subject: [PATCH 5/5] Bump to hamcrest 3.0, actually --- build-tools-internal/version.properties | 2 +- gradle/build.versions.toml | 2 +- gradle/verification-metadata.xml | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/build-tools-internal/version.properties b/build-tools-internal/version.properties index 2761409cff0f4..b4a8bd8085936 100644 --- a/build-tools-internal/version.properties +++ b/build-tools-internal/version.properties @@ -39,7 +39,7 @@ protobuf = 3.25.5 randomizedrunner = 2.8.2 junit = 4.13.2 junit5 = 5.12.1 -hamcrest = 2.2 +hamcrest = 3.0 mocksocket = 1.2 # test container dependencies diff --git a/gradle/build.versions.toml b/gradle/build.versions.toml index 0c5fad69e1d8c..9e470e210fe2b 100644 --- a/gradle/build.versions.toml +++ b/gradle/build.versions.toml @@ -17,7 +17,7 @@ commmons-io = "commons-io:commons-io:2.2" docker-compose = "com.avast.gradle:gradle-docker-compose-plugin:0.17.5" forbiddenApis = "de.thetaphi:forbiddenapis:3.8" gradle-enterprise = "com.gradle:develocity-gradle-plugin:3.19.2" -hamcrest = "org.hamcrest:hamcrest:2.2" +hamcrest = "org.hamcrest:hamcrest:3.0" httpcore5 = "org.apache.httpcomponents.core5:httpcore5:5.3.3" httpclient5 = "org.apache.httpcomponents.client5:httpclient5:5.4.2" idea-ext = "gradle.plugin.org.jetbrains.gradle.plugin.idea-ext:gradle-idea-ext:1.1.4" diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 9875c196ef0f1..f6f986327c6e5 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -3887,6 +3887,11 @@ + + + + +