Apache Lucene open-source search software
[Build] Fix deprecation warning about automatic loading of test framework (#14828)
Rene Groeschke73c0fc1895e7
diff --git a/build-tools/build-infra/src/main/groovy/lucene.java.modules.gradle b/build-tools/build-infra/src/main/groovy/lucene.java.modules.gradleindex 0df59d1973c..6b7a0944a3e 100644--- a/build-tools/build-infra/src/main/groovy/lucene.java.modules.gradle+++ b/build-tools/build-infra/src/main/groovy/lucene.java.modules.gradle@@ -188,7 +188,7 @@ allprojects {jvmArgumentProviders.add(modularPaths.runtimeArguments)// Modify the default classpath.- classpath = modularPaths.runtimeClasspath+ classpath = modularPaths.testRuntimeClasspathdoFirst {modularPaths.logRuntimePaths(logger)@@ -461,6 +461,28 @@ class ModularPathsExtension implements Cloneable, Iterable<Object> {})}+ /**+ * Returns the runtime classpath for test tasks.+ *+ * The plain runtimeClassspath would also filter out junit dependencies, which must+ * be on the Test.classpath as the gradle test worker depends on it.+ * Not having junit explicitly on the classpath would result in a deprecation warning+ * about junit not being on the classpath and indirectly added by gradle internal logic.+ */+ FileCollection getTestRuntimeClasspath() {+ if (mode == Mode.CLASSPATH_ONLY) {+ return sourceSet.runtimeClasspath+ }++ // Modify the default classpath by removing anything already placed on module path.+ // Use a lazy provider to delay computation.+ project.files({+ ->+ return sourceSet.runtimeClasspath - runtimeModulePath - modulePatchOnlyConfiguration ++ sourceSet.runtimeClasspath.filter {file -> file.name.contains("junit")}+ })+ }+CommandLineArgumentProvider getRuntimeArguments() {return new CommandLineArgumentProvider() {@Override