diff --git a/build-tools/geode-japicmp/build.gradle b/build-tools/geode-japicmp/build.gradle index 9136fd3ecc94..78faf559e211 100644 --- a/build-tools/geode-japicmp/build.gradle +++ b/build-tools/geode-japicmp/build.gradle @@ -27,7 +27,7 @@ repositories { dependencies { implementation(gradleApi()) - implementation('me.champeau.gradle:japicmp-gradle-plugin:0.3.0') + implementation('me.champeau.gradle:japicmp-gradle-plugin:0.4.6') } sourceSets { diff --git a/build-tools/geode-repeat-test/build.gradle b/build-tools/geode-repeat-test/build.gradle index 18a74e8d788c..c4028cb971aa 100644 --- a/build-tools/geode-repeat-test/build.gradle +++ b/build-tools/geode-repeat-test/build.gradle @@ -31,7 +31,6 @@ repositories { dependencies { implementation(gradleApi()) - implementation('com.google.guava:guava:31.1-jre') testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1' 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 451b521d39a3..a51ddedaea51 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 @@ -25,7 +25,7 @@ import org.gradle.api.tasks.Input import org.gradle.internal.time.Clock import org.gradle.internal.work.WorkerLeaseService -public class RepeatTest extends Test { +public abstract class RepeatTest extends Test { @Input private int times = 5 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 036f3c691740..65b3a15f095d 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 @@ -14,11 +14,8 @@ */ package org.apache.geode.gradle.testing.repeat; -import java.io.File; -import java.util.List; -import java.util.Set; +import java.util.ArrayList; -import com.google.common.collect.ImmutableSet; import org.gradle.api.file.FileTree; import org.gradle.api.internal.DocumentationRegistry; import org.gradle.api.internal.classpath.ModuleRegistry; @@ -30,6 +27,7 @@ import org.gradle.api.internal.tasks.testing.WorkerTestClassProcessorFactory; import org.gradle.api.internal.tasks.testing.detection.DefaultTestClassScanner; import org.gradle.api.internal.tasks.testing.detection.DefaultTestExecuter; +import org.gradle.api.internal.tasks.testing.detection.ForkedTestClasspathFactory; import org.gradle.api.internal.tasks.testing.detection.TestFrameworkDetector; import org.gradle.api.internal.tasks.testing.filter.DefaultTestFilter; import org.gradle.api.internal.tasks.testing.processors.MaxNParallelTestClassProcessor; @@ -37,6 +35,7 @@ import org.gradle.api.internal.tasks.testing.processors.RestartEveryNTestClassProcessor; import org.gradle.api.internal.tasks.testing.processors.RunPreviousFailedFirstTestClassProcessor; import org.gradle.api.internal.tasks.testing.processors.TestMainAction; +import org.gradle.api.internal.tasks.testing.worker.ForkedTestClasspath; import org.gradle.api.internal.tasks.testing.worker.ForkingTestClassProcessor; import org.gradle.api.logging.Logger; import org.gradle.api.logging.Logging; @@ -47,7 +46,7 @@ import org.gradle.process.internal.worker.WorkerProcessFactory; /** - * A copy of {@link DefaultTestExecuter} from Gradle v7.6.6, modified to process each test class + * A copy of {@link DefaultTestExecuter} from Gradle v8.14.5, modified to process each test class * as many times as it was submitted. This is required by our {@link RepeatTest} task, because: *