From 23381d306eac26c2b22c8040b39d88e505f6d7b9 Mon Sep 17 00:00:00 2001 From: JinwooHwang Date: Tue, 22 Sep 2026 10:00:26 -0400 Subject: [PATCH 1/4] [GEODE-10662] Update test infrastructure plugins for Gradle 7.6.6 APIs --- .../gradle/testing/repeat/RepeatTest.groovy | 4 ++-- .../ExecutionTrackingTestResultProcessor.java | 3 ++- .../testing/repeat/RepeatTestExecuter.java | 18 ++++++++---------- .../geode/gradle/testing/Executers.groovy | 4 ++-- .../apache/geode/gradle/testing/Workers.groovy | 2 +- .../LauncherProxyWorkerProcessBuilder.java | 6 ++++++ 6 files changed, 21 insertions(+), 16 deletions(-) diff --git a/build-tools/geode-repeat-test/src/main/groovy/org/apache/geode/gradle/testing/repeat/RepeatTest.groovy b/build-tools/geode-repeat-test/src/main/groovy/org/apache/geode/gradle/testing/repeat/RepeatTest.groovy index e2d4912fe71d..451b521d39a3 100644 --- a/build-tools/geode-repeat-test/src/main/groovy/org/apache/geode/gradle/testing/repeat/RepeatTest.groovy +++ b/build-tools/geode-repeat-test/src/main/groovy/org/apache/geode/gradle/testing/repeat/RepeatTest.groovy @@ -23,7 +23,7 @@ import org.gradle.api.internal.tasks.testing.filter.DefaultTestFilter import org.gradle.api.tasks.testing.Test import org.gradle.api.tasks.Input import org.gradle.internal.time.Clock -import org.gradle.internal.work.WorkerLeaseRegistry +import org.gradle.internal.work.WorkerLeaseService public class RepeatTest extends Test { @@ -53,7 +53,7 @@ public class RepeatTest extends Test { super.createTestExecuter().workerFactory, getActorFactory(), getModuleRegistry(), - getServices().get(WorkerLeaseRegistry.class), + getServices().get(WorkerLeaseService.class), getServices().get(StartParameter.class).getMaxWorkerCount(), getServices().get(Clock.class), getServices().get(DocumentationRegistry.class), diff --git a/build-tools/geode-repeat-test/src/main/java/org/apache/geode/gradle/testing/repeat/ExecutionTrackingTestResultProcessor.java b/build-tools/geode-repeat-test/src/main/java/org/apache/geode/gradle/testing/repeat/ExecutionTrackingTestResultProcessor.java index 4d0e76d27f88..2e679087da2b 100644 --- a/build-tools/geode-repeat-test/src/main/java/org/apache/geode/gradle/testing/repeat/ExecutionTrackingTestResultProcessor.java +++ b/build-tools/geode-repeat-test/src/main/java/org/apache/geode/gradle/testing/repeat/ExecutionTrackingTestResultProcessor.java @@ -25,6 +25,7 @@ import org.gradle.api.internal.tasks.testing.TestResultProcessor; import org.gradle.api.internal.tasks.testing.TestStartEvent; import org.gradle.api.internal.tasks.testing.worker.WorkerTestClassProcessor; +import org.gradle.api.tasks.testing.TestFailure; import org.gradle.api.tasks.testing.TestOutputEvent; /** @@ -68,7 +69,7 @@ public void output(Object testId, TestOutputEvent event) { } @Override - public void failure(Object testId, Throwable result) { + public void failure(Object testId, TestFailure result) { processor.failure(testId, result); } diff --git a/build-tools/geode-repeat-test/src/main/java/org/apache/geode/gradle/testing/repeat/RepeatTestExecuter.java b/build-tools/geode-repeat-test/src/main/java/org/apache/geode/gradle/testing/repeat/RepeatTestExecuter.java index 58f068106d42..036f3c691740 100644 --- a/build-tools/geode-repeat-test/src/main/java/org/apache/geode/gradle/testing/repeat/RepeatTestExecuter.java +++ b/build-tools/geode-repeat-test/src/main/java/org/apache/geode/gradle/testing/repeat/RepeatTestExecuter.java @@ -43,11 +43,11 @@ import org.gradle.internal.Factory; import org.gradle.internal.actor.ActorFactory; import org.gradle.internal.time.Clock; -import org.gradle.internal.work.WorkerLeaseRegistry; +import org.gradle.internal.work.WorkerLeaseService; import org.gradle.process.internal.worker.WorkerProcessFactory; /** - * A copy of {@link DefaultTestExecuter} from Gradle v6.8.3, modified to process each test class + * A copy of {@link DefaultTestExecuter} from Gradle v7.6.6, modified to process each test class * as many times as it was submitted. This is required by our {@link RepeatTest} task, because: *