diff --git a/dd-java-agent/instrumentation/akka/akka-actor-2.5/build.gradle b/dd-java-agent/instrumentation/akka/akka-actor-2.5/build.gradle index 09adfee54b6..cae28d1fa8f 100644 --- a/dd-java-agent/instrumentation/akka/akka-actor-2.5/build.gradle +++ b/dd-java-agent/instrumentation/akka/akka-actor-2.5/build.gradle @@ -68,6 +68,6 @@ configurations.matching({ it.name.startsWith('akka23') }).each({ // Run 2.3 tests along with the rest of unit tests -tasks.named("test") { +tasks.named("test", Test) { dependsOn "akka23Test" } diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/build.gradle b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/build.gradle index 351cdc58bb1..ec88e612eee 100644 --- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/build.gradle +++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/build.gradle @@ -22,12 +22,12 @@ addTestSuiteForDir 'version101IastTest', 'iastTest' addTestSuiteForDir 'version102IastTest', 'iastTest' addTestSuiteForDir 'latestDepIastTest', 'iastTest' -compileLagomTestJava { +tasks.named("compileLagomTestJava", JavaCompile) { sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 } -compileLagomTestGroovy { +tasks.named("compileLagomTestGroovy", GroovyCompile) { sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 } @@ -170,32 +170,32 @@ dependencies { lagomTestImplementation group: 'com.lightbend.lagom', name: 'lagom-javadsl-testkit_2.11', version: '1.4.0' } -compileBaseTestGroovy { +tasks.named("compileBaseTestGroovy", GroovyCompile) { classpath = classpath.plus(files(compileBaseTestScala.destinationDirectory)) dependsOn "compileBaseTestScala" } -compileBaseForkedTestGroovy { +tasks.named("compileBaseForkedTestGroovy", GroovyCompile) { classpath = classpath.plus(files(compileBaseTestScala.destinationDirectory)) dependsOn "compileBaseTestScala" } -compileVersion101TestGroovy { +tasks.named("compileVersion101TestGroovy", GroovyCompile) { classpath = classpath.plus(files(compileVersion101TestScala.destinationDirectory)) dependsOn "compileVersion101TestScala" } -compileVersion101ForkedTestGroovy { +tasks.named("compileVersion101ForkedTestGroovy", GroovyCompile) { classpath = classpath.plus(files(compileVersion101TestScala.destinationDirectory)) dependsOn "compileVersion101TestScala" } -compileVersion102Scala213TestGroovy { +tasks.named("compileVersion102Scala213TestGroovy", GroovyCompile) { classpath = classpath.plus(files(compileVersion102Scala213TestScala.destinationDirectory)) dependsOn "compileVersion102Scala213TestScala" } -compileLatestDepTestGroovy { +tasks.named("compileLatestDepTestGroovy", GroovyCompile) { classpath = classpath.plus(files(compileLatestDepTestScala.destinationDirectory)) dependsOn "compileLatestDepTestScala" } diff --git a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/build.gradle b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/build.gradle index 89ea277847e..e8758aa2c2e 100644 --- a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/build.gradle +++ b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/build.gradle @@ -42,7 +42,7 @@ addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test') apply from: "$rootDir/gradle/configure_tests.gradle" -latestDepTest { +tasks.named("latestDepTest", Test) { finalizedBy 'latestDepForkedTest' } diff --git a/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/build.gradle b/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/build.gradle index 71fd2913754..4cebc586ab3 100644 --- a/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/build.gradle +++ b/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/build.gradle @@ -92,6 +92,4 @@ dependencies { testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.3') testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:jakarta-servlet-5.0') testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0') - - } diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/build.gradle b/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/build.gradle index 291eb78aca0..4790e3b512f 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/build.gradle +++ b/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/build.gradle @@ -10,15 +10,15 @@ apply from: "$rootDir/gradle/java.gradle" addTestSuiteForDir('latestDepTest', 'test') -test { +tasks.named("test", Test) { environment "_HANDLER", "Handler" } -forkedTest { +tasks.named("forkedTest", Test) { environment "_HANDLER", "Handler" } -latestDepTest { +tasks.named("latestDepTest", Test) { environment "_HANDLER", "Handler" } diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/build.gradle b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/build.gradle index eb2b4ba11c7..40d5d4c778f 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/build.gradle +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/build.gradle @@ -103,10 +103,10 @@ dependencies { latestDepTestImplementation group: 'com.amazonaws', name: 'aws-java-sdk-dynamodb', version: '+' } -tasks.named("test") { +tasks.named("test", Test) { dependsOn "test_before_1_11_106" } -tasks.named("forkedTest") { +tasks.named("forkedTest", Test) { dependsOn "test_before_1_11_106ForkedTest" } diff --git a/dd-java-agent/instrumentation/build.gradle b/dd-java-agent/instrumentation/build.gradle index f9cba65eb2b..136e6f7d905 100644 --- a/dd-java-agent/instrumentation/build.gradle +++ b/dd-java-agent/instrumentation/build.gradle @@ -31,7 +31,7 @@ plugins { apply from: "$rootDir/gradle/java.gradle" -tasks.register("latestDepTest") +tasks.register("latestDepTest", Test) Project parent_project = project subprojects { Project subProj -> @@ -129,7 +129,7 @@ if (project.gradle.startParameter.taskNames.any { it.endsWith("generateMuzzleRep } -tasks.named('shadowJar') { +tasks.named('shadowJar', ShadowJar) { duplicatesStrategy = DuplicatesStrategy.FAIL dependencies { // the tracer is now in a separate shadow jar diff --git a/dd-java-agent/instrumentation/enable-wallclock-profiling/build.gradle b/dd-java-agent/instrumentation/enable-wallclock-profiling/build.gradle index c053f0b80b5..ea7dd0cbe3d 100644 --- a/dd-java-agent/instrumentation/enable-wallclock-profiling/build.gradle +++ b/dd-java-agent/instrumentation/enable-wallclock-profiling/build.gradle @@ -31,7 +31,7 @@ dependencies { latestDepTestImplementation group: 'io.netty', name: 'netty-transport', version: '+' } -tasks.named("latestDepTest") { +tasks.named("latestDepTest", Test) { dependsOn "latestDep4Test" } diff --git a/dd-java-agent/instrumentation/exception-profiling/build.gradle b/dd-java-agent/instrumentation/exception-profiling/build.gradle index e993d486937..6f90365731c 100644 --- a/dd-java-agent/instrumentation/exception-profiling/build.gradle +++ b/dd-java-agent/instrumentation/exception-profiling/build.gradle @@ -26,11 +26,11 @@ dependencies { } } -forbiddenApisMain_java11 { +tasks.named("forbiddenApisMain_java11") { failOnMissingClasses = false } -test { +tasks.named("test", Test) { useJUnitPlatform() } diff --git a/dd-java-agent/instrumentation/finatra-2.9/build.gradle b/dd-java-agent/instrumentation/finatra-2.9/build.gradle index 7435c01382c..45a3ce2243c 100644 --- a/dd-java-agent/instrumentation/finatra-2.9/build.gradle +++ b/dd-java-agent/instrumentation/finatra-2.9/build.gradle @@ -45,6 +45,6 @@ tasks.named("compileLatestPre207TestGroovy", GroovyCompile) { dependsOn "compileLatestPre207TestScala" } -tasks.named("latestDepTest") { +tasks.named("latestDepTest", Test) { finalizedBy latestPre207Test } diff --git a/dd-java-agent/instrumentation/gradle-testing/build.gradle b/dd-java-agent/instrumentation/gradle-testing/build.gradle index 174880b8a18..100bd08fb97 100644 --- a/dd-java-agent/instrumentation/gradle-testing/build.gradle +++ b/dd-java-agent/instrumentation/gradle-testing/build.gradle @@ -12,6 +12,6 @@ dependencies { compileOnly project(":dd-java-agent:instrumentation:junit:junit-4.10") } -forbiddenApisMain { +tasks.named("forbiddenApisMain") { failOnMissingClasses = false } diff --git a/dd-java-agent/instrumentation/gradle/gradle-3.0/build.gradle b/dd-java-agent/instrumentation/gradle/gradle-3.0/build.gradle index 277663acc4b..53208256d37 100644 --- a/dd-java-agent/instrumentation/gradle/gradle-3.0/build.gradle +++ b/dd-java-agent/instrumentation/gradle/gradle-3.0/build.gradle @@ -10,6 +10,6 @@ dependencies { compileOnly gradleApi() } -forbiddenApisMain { +tasks.named("forbiddenApisMain") { failOnMissingClasses = false } diff --git a/dd-java-agent/instrumentation/gradle/gradle-8.3/build.gradle b/dd-java-agent/instrumentation/gradle/gradle-8.3/build.gradle index 277663acc4b..53208256d37 100644 --- a/dd-java-agent/instrumentation/gradle/gradle-8.3/build.gradle +++ b/dd-java-agent/instrumentation/gradle/gradle-8.3/build.gradle @@ -10,6 +10,6 @@ dependencies { compileOnly gradleApi() } -forbiddenApisMain { +tasks.named("forbiddenApisMain") { failOnMissingClasses = false } diff --git a/dd-java-agent/instrumentation/iast-instrumenter/build.gradle b/dd-java-agent/instrumentation/iast-instrumenter/build.gradle index 5c87f017d35..9fe2827d46b 100644 --- a/dd-java-agent/instrumentation/iast-instrumenter/build.gradle +++ b/dd-java-agent/instrumentation/iast-instrumenter/build.gradle @@ -9,8 +9,13 @@ apply from: "${rootDir}/gradle/tries.gradle" addTestSuiteForDir('latestDepTest', 'test') -compileJava.dependsOn 'generateClassNameTries' -sourcesJar.dependsOn 'generateClassNameTries' +tasks.named("compileJava", JavaCompile) { + dependsOn("generateClassNameTries") +} + +tasks.named("sourcesJar", Jar) { + dependsOn("generateClassNameTries") +} dependencies { testImplementation project(':dd-java-agent:agent-tooling') diff --git a/dd-java-agent/instrumentation/jakarta-jms/build.gradle b/dd-java-agent/instrumentation/jakarta-jms/build.gradle index ff497d21c84..301cc89c030 100644 --- a/dd-java-agent/instrumentation/jakarta-jms/build.gradle +++ b/dd-java-agent/instrumentation/jakarta-jms/build.gradle @@ -24,7 +24,7 @@ repositories { } } -compileTestGroovy { +tasks.named("compileTestGroovy", GroovyCompile) { it.javaLauncher = getJavaLauncherFor(17) } diff --git a/dd-java-agent/instrumentation/jakarta-rs-annotations-3/build.gradle b/dd-java-agent/instrumentation/jakarta-rs-annotations-3/build.gradle index 86c98addc74..60c00532ef0 100644 --- a/dd-java-agent/instrumentation/jakarta-rs-annotations-3/build.gradle +++ b/dd-java-agent/instrumentation/jakarta-rs-annotations-3/build.gradle @@ -15,10 +15,12 @@ addTestSuiteExtendingForDir('latestDepJava11Test', 'latestDepTest', 'test') tasks.named("compileLatestDepJava11TestJava", JavaCompile) { configureCompiler(it, 11) } + tasks.named("compileLatestDepJava11TestGroovy", GroovyCompile) { javaLauncher = getJavaLauncherFor(11) } -tasks.named("latestDepJava11Test") { + +tasks.named("latestDepJava11Test", Test) { javaLauncher = getJavaLauncherFor(11) } diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/build.gradle b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/build.gradle index 34402077830..ceb9d380312 100644 --- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/build.gradle +++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/build.gradle @@ -41,7 +41,7 @@ tasks.named("compilePreviewTestJava", JavaCompile) { options.compilerArgs.add("--enable-preview") } // Configure tests execution -tasks.named("previewTest") { +tasks.named("previewTest", Test) { jvmArgs = ['--enable-preview'] } // Require the preview test suite to run as part of module check diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/build.gradle b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/build.gradle index 559f015a0b5..7987b836056 100644 --- a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/build.gradle +++ b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/build.gradle @@ -16,11 +16,11 @@ tasks.named("compileMain_java11Java", JavaCompile) { configureCompiler(it, 11, JavaVersion.VERSION_11) } -tasks.named("compileTestGroovy") { +tasks.named("compileTestGroovy", GroovyCompile) { javaLauncher = getJavaLauncherFor(11) } -forbiddenApisMain_java11 { +tasks.named("forbiddenApisMain_java11") { failOnMissingClasses = false } diff --git a/dd-java-agent/instrumentation/java/java-nio-1.8/build.gradle b/dd-java-agent/instrumentation/java/java-nio-1.8/build.gradle index 1bb8891d599..3646b9f5d83 100644 --- a/dd-java-agent/instrumentation/java/java-nio-1.8/build.gradle +++ b/dd-java-agent/instrumentation/java/java-nio-1.8/build.gradle @@ -19,7 +19,7 @@ apply plugin: "idea" } } -forbiddenApisMain_java11 { +tasks.named("forbiddenApisMain_java11") { failOnMissingClasses = false } diff --git a/dd-java-agent/instrumentation/jax-rs-annotations-2/build.gradle b/dd-java-agent/instrumentation/jax-rs-annotations-2/build.gradle index 24a7d8fdc9d..08d2b69574f 100644 --- a/dd-java-agent/instrumentation/jax-rs-annotations-2/build.gradle +++ b/dd-java-agent/instrumentation/jax-rs-annotations-2/build.gradle @@ -54,7 +54,7 @@ dependencies { latestDepTestImplementation group: 'org.jboss.resteasy', name: 'resteasy-jaxrs', version: '+' } -tasks.named("test") { +tasks.named("test", Test) { dependsOn "resteasy31Test" dependsOn "nestedTest" } diff --git a/dd-java-agent/instrumentation/jdbc/build.gradle b/dd-java-agent/instrumentation/jdbc/build.gradle index d4933adecf1..9c1d1d2711e 100644 --- a/dd-java-agent/instrumentation/jdbc/build.gradle +++ b/dd-java-agent/instrumentation/jdbc/build.gradle @@ -83,7 +83,7 @@ tasks.named("check") { dependsOn "oldPostgresTest" } -tasks.named("latestDepJava11Test") { +tasks.named("latestDepJava11Test", Test) { javaLauncher = getJavaLauncherFor(11) } diff --git a/dd-java-agent/instrumentation/jersey/build.gradle b/dd-java-agent/instrumentation/jersey/build.gradle index 423ad5c73f1..887cbdc0e57 100644 --- a/dd-java-agent/instrumentation/jersey/build.gradle +++ b/dd-java-agent/instrumentation/jersey/build.gradle @@ -19,17 +19,18 @@ apply from: "$rootDir/gradle/java.gradle" addTestSuiteForDir('jersey2JettyTest', 'jersey2JettyTest') addTestSuiteForDir('jersey3JettyTest', 'jersey3JettyTest') -compileJersey3JettyTestGroovy { +tasks.named("compileJersey3JettyTestGroovy", GroovyCompile) { javaLauncher = getJavaLauncherFor(11) } + compileTestJava.configure { configureCompiler(it, 11, JavaVersion.VERSION_11) } -jersey3JettyTest { +tasks.named("jersey3JettyTest", Test) { javaLauncher = getJavaLauncherFor(11) } -test { +tasks.named("test", Test) { javaLauncher = getJavaLauncherFor(11) } diff --git a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/build.gradle index 94d3d7a093d..7e9852f8d7b 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/build.gradle +++ b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/build.gradle @@ -15,7 +15,7 @@ apply from: "$rootDir/gradle/java.gradle" addTestSuiteForDir('latestDepTest', 'test') -tasks.named("compileMain_java17Java") { +tasks.named("compileMain_java17Java", JavaCompile) { configureCompiler(it, 17, JavaVersion.VERSION_17) } diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/build.gradle index 1c61e98ec84..0b72971f6a9 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/build.gradle +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/build.gradle @@ -44,7 +44,7 @@ addTestSuiteExtendingForDir('ee10LatestDepForkedTest', 'ee10LatestDepTest', 'tes } } -forbiddenApisMain_java17 { +tasks.named("forbiddenApisMain_java17") { failOnMissingClasses = false } diff --git a/dd-java-agent/instrumentation/jms/build.gradle b/dd-java-agent/instrumentation/jms/build.gradle index 949e51a4f0a..d8f1f40fbdb 100644 --- a/dd-java-agent/instrumentation/jms/build.gradle +++ b/dd-java-agent/instrumentation/jms/build.gradle @@ -28,7 +28,7 @@ addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test') apply from: "$rootDir/gradle/configure_tests.gradle" -latestDepTest { +tasks.named("latestDepTest", Test) { finalizedBy 'latestDepForkedTest' } diff --git a/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/build.gradle b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/build.gradle index 54195ad5ed6..5f3a1fd306e 100644 --- a/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/build.gradle +++ b/dd-java-agent/instrumentation/junit/junit-4.10/munit-junit-4/build.gradle @@ -31,12 +31,12 @@ dependencies { latestDepTestImplementation group: 'org.scalameta', name: 'munit_2.13', version: '+' } -tasks.named("compileTestGroovy") { +tasks.named("compileTestGroovy", GroovyCompile) { dependsOn compileTestScala classpath += files(sourceSets.test.scala.destinationDirectory) } -tasks.named("compileLatestDepTestGroovy") { +tasks.named("compileLatestDepTestGroovy", GroovyCompile) { dependsOn compileLatestDepTestScala classpath += files(sourceSets.latestDepTest.scala.destinationDirectory) } diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/build.gradle b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/build.gradle index 7d2e93d7d48..f72dbf676bd 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/build.gradle +++ b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/build.gradle @@ -66,7 +66,7 @@ dependencies { iastLatestDepTest3Implementation project(':dd-java-agent:agent-iast:iast-test-fixtures') } -iastLatestDepTest3.configure { +tasks.named("iastLatestDepTest3", Test) { javaLauncher = getJavaLauncherFor(17) jvmArgs = ['--add-opens', 'java.base/java.util=ALL-UNNAMED'] } diff --git a/dd-java-agent/instrumentation/mule-4.5/build.gradle b/dd-java-agent/instrumentation/mule-4.5/build.gradle index 85f813129c5..2f2291465d8 100644 --- a/dd-java-agent/instrumentation/mule-4.5/build.gradle +++ b/dd-java-agent/instrumentation/mule-4.5/build.gradle @@ -100,7 +100,7 @@ sourceSets { } } -tasks.named("compileMain_java11Java") { +tasks.named("compileMain_java11Java", JavaCompile) { configureCompiler(it, 11, JavaVersion.VERSION_1_8) } diff --git a/dd-java-agent/instrumentation/netty/netty-buffer-4.0/build.gradle b/dd-java-agent/instrumentation/netty/netty-buffer-4.0/build.gradle index 890373d9e39..f9e79837f22 100644 --- a/dd-java-agent/instrumentation/netty/netty-buffer-4.0/build.gradle +++ b/dd-java-agent/instrumentation/netty/netty-buffer-4.0/build.gradle @@ -21,6 +21,6 @@ dependencies { latestDepTestImplementation group: 'io.netty', name: 'netty-buffer', version: '+' } -tasks.named("latestDepTest") { +tasks.named("latestDepTest", Test) { dependsOn "latestDep4Test" } diff --git a/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/build.gradle b/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/build.gradle index a6119373137..a9edc6abcae 100644 --- a/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/build.gradle +++ b/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/build.gradle @@ -21,7 +21,7 @@ dependencies { latestDepTestImplementation group: 'io.netty', name: 'netty-common', version: '+' } -tasks.named("latestDepTest") { +tasks.named("latestDepTest", Test) { dependsOn "latestDep4Test" } diff --git a/dd-java-agent/instrumentation/netty/netty-promise-4.0/build.gradle b/dd-java-agent/instrumentation/netty/netty-promise-4.0/build.gradle index 35a01fa44bc..571f21ddfb5 100644 --- a/dd-java-agent/instrumentation/netty/netty-promise-4.0/build.gradle +++ b/dd-java-agent/instrumentation/netty/netty-promise-4.0/build.gradle @@ -21,6 +21,6 @@ dependencies { latestDepTestImplementation group: 'io.netty', name: 'netty-common', version: '+' } -tasks.named("latestDepTest") { +tasks.named("latestDepTest", Test) { dependsOn "latestDep4Test" } diff --git a/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/build.gradle b/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/build.gradle index f0d24b7e7a6..31f7ec32aea 100644 --- a/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/build.gradle +++ b/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/build.gradle @@ -27,7 +27,6 @@ tasks.named("compileLatestDepTestGroovy", GroovyCompile) { classpath += files(sourceSets.latestDepTest.scala.classesDirectory) } - dependencies { compileOnly group: 'org.apache.pekko', name: "pekko-actor_2.12", version: pekkoVersion diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/build.gradle b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/build.gradle index 50659fd2d70..51033d7d999 100644 --- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/build.gradle +++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/build.gradle @@ -88,7 +88,7 @@ dependencies { latestDepIastTestImplementation project(':dd-java-agent:instrumentation:jackson-core:jackson-core-2.16') } -iastTest { +tasks.named("iastTest", Test) { filter { // This class must be excluded from scanning because it references class from "org.apache.pekko.http" package. // When JUnit 5 scans this class, it loads every other class that is present in its method signatures (arguments, return types, throws). @@ -101,33 +101,33 @@ iastTest { } } -latestDepIastTest { +tasks.named("latestDepIastTest", Test) { filter { // Exclude the same problematic class as for iastTest to avoid class loading issues. excludeTestsMatching("*PekkoIastTestWebServer*") } } -tasks.named("test") { +tasks.named("test", Test) { dependsOn "baseTest" dependsOn "iastTest" } -tasks.named('latestDepTest') { +tasks.named("latestDepTest", Test) { dependsOn "latestDepIastTest" } -compileBaseTestGroovy { +tasks.named("compileBaseTestGroovy", GroovyCompile) { classpath = classpath.plus(files(compileBaseTestScala.destinationDirectory)) dependsOn "compileBaseTestScala" } -compileLatestDepTestGroovy { +tasks.named("compileLatestDepTestGroovy", GroovyCompile) { classpath = classpath.plus(files(compileLatestDepTestScala.destinationDirectory)) dependsOn "compileLatestDepTestScala" } -compileLatestPekko10TestGroovy { +tasks.named("compileLatestPekko10TestGroovy", GroovyCompile) { classpath = classpath.plus(files(compileLatestDepTestScala.destinationDirectory)) dependsOn "compileLatestDepTestScala" } diff --git a/dd-java-agent/instrumentation/play/play-2.3/build.gradle b/dd-java-agent/instrumentation/play/play-2.3/build.gradle index 12f1571fa5d..a371b5e88a7 100644 --- a/dd-java-agent/instrumentation/play/play-2.3/build.gradle +++ b/dd-java-agent/instrumentation/play/play-2.3/build.gradle @@ -59,7 +59,7 @@ dependencies { } } -compileLatestDepTestGroovy { +tasks.named("compileLatestDepTestGroovy", GroovyCompile) { classpath = classpath.plus(files(compileLatestDepTestScala.destinationDirectory)) dependsOn compileLatestDepTestScala } diff --git a/dd-java-agent/instrumentation/play/play-2.4/build.gradle b/dd-java-agent/instrumentation/play/play-2.4/build.gradle index 8a8dd498881..be824377a54 100644 --- a/dd-java-agent/instrumentation/play/play-2.4/build.gradle +++ b/dd-java-agent/instrumentation/play/play-2.4/build.gradle @@ -57,13 +57,16 @@ sourceSets { java.srcDirs "${project.projectDir}/src/main/java_play25" } } -jar { + +tasks.named("jar", Jar) { from sourceSets.main_play25.output } + project.afterEvaluate { p -> instrumentJava.dependsOn compileMain_play25Java forbiddenApisMain_play25.dependsOn instrumentMain_play25Java } + instrument { additionalClasspath = [ instrumentJava: compileMain_play25Java.destinationDirectory @@ -99,11 +102,13 @@ dependencies { exclude group: 'org.eclipse.jetty.websocket', module: 'websocket-client' } } -compileTestGroovy { + +tasks.named("compileTestGroovy", GroovyCompile) { classpath = classpath + files(compileTestScala.destinationDirectory) dependsOn 'compileTestScala' } -compileLatestDepTestGroovy { + +tasks.named("compileLatestDepTestGroovy", GroovyCompile) { classpath = classpath + files(compileLatestDepTestScala.destinationDirectory) dependsOn 'compileLatestDepTestScala' } @@ -125,10 +130,12 @@ sourceSets { } } } + dependencies { routeGeneratorImplementation libs.scala211 routeGeneratorImplementation group: 'com.typesafe.play', name: "routes-compiler_2.11", version: '2.5.0' } + configurations { testGeneratedCompileClasspath.extendsFrom testCompileClasspath latestDepTestGeneratedCompileClasspath.extendsFrom latestDepTestCompileClasspath @@ -161,36 +168,42 @@ configurations { dependsOn compileRouteGeneratorScala } } -compileTestGeneratedScala { + +tasks.named("compileTestGeneratedScala", ScalaCompile) { classpath = classpath + files(compileTestScala.destinationDirectory) dependsOn buildTestRoutes, compileLatestDepTestScala } -compileLatestDepTestGeneratedScala { + +tasks.named("compileLatestDepTestGeneratedScala", ScalaCompile) { classpath = classpath + files(compileLatestDepTestScala.destinationDirectory) dependsOn buildLatestDepTestRoutes, compileLatestDepTestScala } -compileTestGroovy { + +tasks.named("compileTestGroovy", GroovyCompile) { classpath = classpath + files(compileTestGeneratedScala.destinationDirectory) dependsOn 'compileTestGeneratedScala' } -compileLatestDepTestGroovy { + +tasks.named("compileLatestDepTestGroovy", GroovyCompile) { classpath = classpath + files(compileLatestDepTestGeneratedScala.destinationDirectory) dependsOn 'compileLatestDepTestGeneratedScala' } // do it this way rather than through dependencies {} because // latestDepTestImplementation extends testImplementation -test { +tasks.named("test", Test) { classpath = classpath + files(compileTestGeneratedScala.destinationDirectory) } -latestDepTest { + +tasks.named("latestDepTest", Test) { classpath = classpath + files(compileLatestDepTestGeneratedScala.destinationDirectory) } -forbiddenApisTestGenerated { +tasks.named("forbiddenApisTestGenerated") { enabled = false } -forbiddenApisLatestDepTestGenerated { + +tasks.named("forbiddenApisLatestDepTestGenerated") { enabled = false } diff --git a/dd-java-agent/instrumentation/play/play-2.6/build.gradle b/dd-java-agent/instrumentation/play/play-2.6/build.gradle index fc363a17fe8..aa0a2b9b738 100644 --- a/dd-java-agent/instrumentation/play/play-2.6/build.gradle +++ b/dd-java-agent/instrumentation/play/play-2.6/build.gradle @@ -72,14 +72,20 @@ sourceSets { java.srcDirs "${project.projectDir}/src/main/java_play27" } } -jar { + +tasks.named("jar", Jar) { from sourceSets.main_play27.output } -compileMain_play27Java.dependsOn compileJava + +tasks.named("compileMain_play27Java", JavaCompile) { + dependsOn(compileJava) +} + project.afterEvaluate { p -> instrumentJava.dependsOn compileMain_play27Java forbiddenApisMain_play27.dependsOn instrumentMain_play27Java } + instrument { additionalClasspath = [ instrumentJava: compileMain_play27Java.destinationDirectory @@ -120,21 +126,25 @@ dependencies { } latestDepTestImplementation group: 'com.typesafe.play', name: 'play-akka-http-server_2.13', version: '2.+' } + configurations.matching({ it.name.startsWith('latestDepTest') }).each({ it.resolutionStrategy { // logback-classic 1.4.11 doesn't like being loaded in the bootstrap classloader (NPE) force group: 'ch.qos.logback', name: 'logback-classic', version: '1.4.5' } }) + tasks.named("compileLatestDepTestJava", JavaCompile) { configureCompiler(it, 11) } -compileLatestDepTestScala { + +tasks.named("compileLatestDepTestScala", ScalaCompile) { javaLauncher = getJavaLauncherFor(11) classpath = classpath + files(compileBaseTestJava.destinationDirectory) dependsOn 'compileBaseTestJava' } -latestDepTest { + +tasks.named("latestDepTest", Test) { javaLauncher = getJavaLauncherFor(11) testClassesDirs = testClassesDirs + sourceSets.baseTest.output.classesDirs } @@ -152,10 +162,12 @@ sourceSets { } } } + dependencies { routeGeneratorImplementation libs.scala213 routeGeneratorImplementation group: 'com.typesafe.play', name: "routes-compiler_2.13", version: '2.+' } + configurations { latestDepTestGeneratedCompileClasspath.extendsFrom(latestDepTestCompileClasspath) } @@ -178,16 +190,18 @@ tasks.register('buildLatestDepTestRoutes', JavaExec) { dependsOn compileRouteGeneratorScala, compileLatestDepTestScala } -compileLatestDepTestGeneratedScala { + +tasks.named("compileLatestDepTestGeneratedScala", ScalaCompile) { javaLauncher = getJavaLauncherFor(11) classpath = classpath + files(compileLatestDepTestScala.destinationDirectory) dependsOn buildLatestDepTestRoutes, compileLatestDepTestScala } -forbiddenApisLatestDepTestGenerated { + +tasks.named("forbiddenApisLatestDepTestGenerated") { enabled = false } -compileLatestDepTestGroovy { +tasks.named("compileLatestDepTestGroovy", GroovyCompile) { javaLauncher = getJavaLauncherFor(11) classpath = classpath + files(compileLatestDepTestScala.destinationDirectory) + @@ -199,6 +213,7 @@ compileLatestDepTestGroovy { dependsOn 'compileBaseTestJava' dependsOn 'compileLatestDepTestGeneratedScala' } + dependencies { latestDepTestRuntimeOnly sourceSets.latestDepTestGenerated.output } diff --git a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/build.gradle b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/build.gradle index 3228d059063..3d718830aab 100644 --- a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/build.gradle +++ b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/build.gradle @@ -40,6 +40,6 @@ tasks.withType(Test).configureEach { usesService(testcontainersLimit) } -tasks.named("latestDepTest") { +tasks.named("latestDepTest", Test) { finalizedBy latestReactorTest } diff --git a/dd-java-agent/instrumentation/resteasy-appsec/build.gradle b/dd-java-agent/instrumentation/resteasy-appsec/build.gradle index 7d80a9e81f7..9d05c66c564 100644 --- a/dd-java-agent/instrumentation/resteasy-appsec/build.gradle +++ b/dd-java-agent/instrumentation/resteasy-appsec/build.gradle @@ -21,7 +21,10 @@ addTestSuite('jettyAsyncTest') //check.dependsOn nettyTest, jettyAsyncTest // CI invocations are only for test/latestDepTest -test.finalizedBy nettyTest, jettyAsyncTest +tasks.named("test", Test) { + finalizedBy(nettyTest, jettyAsyncTest) +} + configurations.configureEach { resolutionStrategy.deactivateDependencyLocking() } diff --git a/dd-java-agent/instrumentation/restlet-2.2/build.gradle b/dd-java-agent/instrumentation/restlet-2.2/build.gradle index 67a30626a17..3ca1279062c 100644 --- a/dd-java-agent/instrumentation/restlet-2.2/build.gradle +++ b/dd-java-agent/instrumentation/restlet-2.2/build.gradle @@ -23,7 +23,7 @@ repositories { addTestSuiteForDir('baseForkedTest', 'baseTest') addTestSuite('latestDepTest') -tasks.named("test") { +tasks.named("test", Test) { dependsOn "baseForkedTest" } diff --git a/dd-java-agent/instrumentation/rmi/build.gradle b/dd-java-agent/instrumentation/rmi/build.gradle index f1b77dbaf30..5038ac21a5d 100644 --- a/dd-java-agent/instrumentation/rmi/build.gradle +++ b/dd-java-agent/instrumentation/rmi/build.gradle @@ -32,6 +32,6 @@ def rmic = tasks.register('rmic', Exec) { ) } -tasks.named("test") { +tasks.named("test", Test) { dependsOn rmic } diff --git a/dd-java-agent/instrumentation/scala-concurrent/build.gradle b/dd-java-agent/instrumentation/scala-concurrent/build.gradle index 41ba30358ad..6acbd62e5b5 100644 --- a/dd-java-agent/instrumentation/scala-concurrent/build.gradle +++ b/dd-java-agent/instrumentation/scala-concurrent/build.gradle @@ -45,7 +45,7 @@ dependencies { latestDepTestImplementation project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.13') } -tasks.named("latestDepTest") { +tasks.named("latestDepTest", Test) { dependsOn "latest11Test" dependsOn "latest12Test" } diff --git a/dd-java-agent/instrumentation/scala-promise/scala-promise-2.10/build.gradle b/dd-java-agent/instrumentation/scala-promise/scala-promise-2.10/build.gradle index 94bd27fb9ec..4d170e05420 100644 --- a/dd-java-agent/instrumentation/scala-promise/scala-promise-2.10/build.gradle +++ b/dd-java-agent/instrumentation/scala-promise/scala-promise-2.10/build.gradle @@ -30,7 +30,7 @@ addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'forkedTest' apply from: "$rootDir/gradle/configure_tests.gradle" -latestDepTest { +tasks.named("latestDepTest", Test) { finalizedBy 'latestDepForkedTest' } diff --git a/dd-java-agent/instrumentation/scala-promise/scala-promise-2.13/build.gradle b/dd-java-agent/instrumentation/scala-promise/scala-promise-2.13/build.gradle index f5230000cfe..3bb3d2df5dc 100644 --- a/dd-java-agent/instrumentation/scala-promise/scala-promise-2.13/build.gradle +++ b/dd-java-agent/instrumentation/scala-promise/scala-promise-2.13/build.gradle @@ -30,7 +30,7 @@ addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'forkedTest' apply from: "$rootDir/gradle/configure_tests.gradle" -latestDepTest { +tasks.named("latestDepTest", Test) { finalizedBy 'latestDepForkedTest' } diff --git a/dd-java-agent/instrumentation/scalatest/build.gradle b/dd-java-agent/instrumentation/scalatest/build.gradle index 47d334444be..a674971ab1a 100644 --- a/dd-java-agent/instrumentation/scalatest/build.gradle +++ b/dd-java-agent/instrumentation/scalatest/build.gradle @@ -23,12 +23,12 @@ dependencies { latestDepTestImplementation group: 'org.scalatest', name: 'scalatest_2.12', version: '+' } -tasks.named("compileTestGroovy") { +tasks.named("compileTestGroovy", GroovyCompile) { dependsOn compileTestScala classpath += files(sourceSets.test.scala.destinationDirectory) } -tasks.named("compileLatestDepTestGroovy") { +tasks.named("compileLatestDepTestGroovy", GroovyCompile) { dependsOn compileLatestDepTestScala classpath += files(sourceSets.latestDepTest.scala.destinationDirectory) } diff --git a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/build.gradle b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/build.gradle index 031239f12e4..ad5192d7df1 100644 --- a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/build.gradle +++ b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/build.gradle @@ -72,6 +72,6 @@ dependencies { // tested on tomcat-5.5:latestDepTest } -jar { +tasks.named("jar", Jar) { from zipTree(relocatedJavaxJar.outputs.files.asPath) } diff --git a/dd-java-agent/instrumentation/spark/spark_2.12/build.gradle b/dd-java-agent/instrumentation/spark/spark_2.12/build.gradle index 62b38438696..0f7451a25d7 100644 --- a/dd-java-agent/instrumentation/spark/spark_2.12/build.gradle +++ b/dd-java-agent/instrumentation/spark/spark_2.12/build.gradle @@ -58,7 +58,7 @@ dependencies { latestDepTestImplementation group: 'org.apache.spark', name: "spark-yarn_$scalaVersion", version: '+' } -tasks.named("test") { +tasks.named("test", Test) { dependsOn "test_spark24" dependsOn "test_spark32" } diff --git a/dd-java-agent/instrumentation/spark/spark_2.13/build.gradle b/dd-java-agent/instrumentation/spark/spark_2.13/build.gradle index d092bca8f48..0dd13f5c96e 100644 --- a/dd-java-agent/instrumentation/spark/spark_2.13/build.gradle +++ b/dd-java-agent/instrumentation/spark/spark_2.13/build.gradle @@ -57,6 +57,6 @@ dependencies { latestDepTestImplementation group: 'org.apache.spark', name: "spark-yarn_$scalaVersion", version: '3.+' } -tasks.named("test") { +tasks.named("test", Test) { dependsOn "test_spark32" } diff --git a/dd-java-agent/instrumentation/spring/spring-jms-3.1/build.gradle b/dd-java-agent/instrumentation/spring/spring-jms-3.1/build.gradle index 5a840a6068a..a8ed32d6221 100644 --- a/dd-java-agent/instrumentation/spring/spring-jms-3.1/build.gradle +++ b/dd-java-agent/instrumentation/spring/spring-jms-3.1/build.gradle @@ -14,7 +14,7 @@ addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test') apply from: "$rootDir/gradle/configure_tests.gradle" -latestDepTest { +tasks.named("latestDepTest", Test) { finalizedBy 'latestDepForkedTest' } diff --git a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/build.gradle b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/build.gradle index 407bb5ce150..f544d3bfb97 100644 --- a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/build.gradle +++ b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/build.gradle @@ -42,12 +42,7 @@ addTestSuiteForDir('latestSpring5Test', 'test') ["spring6Test", "latestDepTest", "latestDepForkedTest"].each { name -> tasks.named(name, Test) { javaLauncher = getJavaLauncherFor(17) - } -} - -["spring6Test", "latestDepTest", "latestDepForkedTest"].each { name -> - tasks.named(name, Test) { - jvmArgs '--add-opens', 'java.base/java.util=ALL-UNNAMED' + jvmArgs("--add-opens", "java.base/java.util=ALL-UNNAMED") } } diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/build.gradle b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/build.gradle index 17c5a2291ae..65608606cf4 100644 --- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/build.gradle +++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/build.gradle @@ -130,7 +130,7 @@ dependencies { latestIastTestImplementation project(':dd-java-agent:instrumentation:jackson-core:jackson-core-2.12') } -tasks.named("latestDepTest") { +tasks.named("latestDepTest", Test) { dependsOn "latestBoot20Test" dependsOn "latestBoot24Test" dependsOn "latestBoot2LatestTest" diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-6.0/build.gradle b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-6.0/build.gradle index e85aeaf5778..385a4679eeb 100644 --- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-6.0/build.gradle +++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-6.0/build.gradle @@ -19,7 +19,7 @@ tasks.withType(GroovyCompile).configureEach { it.javaLauncher = getJavaLauncherFor(17) } -iastTest { +tasks.named("iastTest", Test) { jvmArgs '--add-opens', 'java.base/java.util=ALL-UNNAMED' } diff --git a/dd-java-agent/instrumentation/spymemcached-2.10/build.gradle b/dd-java-agent/instrumentation/spymemcached-2.10/build.gradle index eeeb24822a7..565824ff70d 100644 --- a/dd-java-agent/instrumentation/spymemcached-2.10/build.gradle +++ b/dd-java-agent/instrumentation/spymemcached-2.10/build.gradle @@ -10,13 +10,13 @@ muzzle { apply from: "$rootDir/gradle/java.gradle" apply from: "$rootDir/gradle/configure_tests.gradle" - addTestSuiteForDir('latestDepTest', 'test') addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test') -latestDepTest { +tasks.named("latestDepTest", Test) { finalizedBy 'latestDepForkedTest' } + dependencies { compileOnly group: 'net.spy', name: 'spymemcached', version: '2.10.4' diff --git a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-3.9/build.gradle b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-3.9/build.gradle index abf9862e4f2..93f9000af8d 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-3.9/build.gradle +++ b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-3.9/build.gradle @@ -16,7 +16,7 @@ addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test') apply from: "$rootDir/gradle/configure_tests.gradle" -latestDepTest { +tasks.named("latestDepTest", Test) { finalizedBy 'latestDepForkedTest' } diff --git a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.0/build.gradle b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.0/build.gradle index d91c485c2b5..e04507cb8ba 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.0/build.gradle +++ b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.0/build.gradle @@ -15,7 +15,7 @@ addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test') apply from: "$rootDir/gradle/configure_tests.gradle" -latestDepTest { +tasks.named("latestDepTest", Test) { finalizedBy 'latestDepForkedTest' } diff --git a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.4.2/build.gradle b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.4.2/build.gradle index 78d8ae4d01a..6159f4e43e8 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.4.2/build.gradle +++ b/dd-java-agent/instrumentation/vertx/vertx-mysql-client/vertx-mysql-client-4.4.2/build.gradle @@ -15,7 +15,7 @@ addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test') apply from: "$rootDir/gradle/configure_tests.gradle" -latestDepTest { +tasks.named("latestDepTest", Test) { finalizedBy 'latestDepForkedTest' } diff --git a/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.0/build.gradle b/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.0/build.gradle index 1c8ec1d2f12..46dfa1e16f4 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.0/build.gradle +++ b/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.0/build.gradle @@ -23,7 +23,7 @@ addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test') apply from: "$rootDir/gradle/configure_tests.gradle" -latestDepTest { +tasks.named("latestDepTest", Test) { finalizedBy 'latestDepForkedTest' } diff --git a/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.4.2/build.gradle b/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.4.2/build.gradle index fdc8fe1e71c..8f29134c68c 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.4.2/build.gradle +++ b/dd-java-agent/instrumentation/vertx/vertx-pg-client/vertx-pg-client-4.4.2/build.gradle @@ -14,7 +14,7 @@ addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test') apply from: "$rootDir/gradle/configure_tests.gradle" -latestDepTest { +tasks.named("latestDepTest", Test) { finalizedBy 'latestDepForkedTest' } diff --git a/dd-java-agent/instrumentation/vertx/vertx-rx-3.5/build.gradle b/dd-java-agent/instrumentation/vertx/vertx-rx-3.5/build.gradle index 4823900139c..fdf319a2514 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-rx-3.5/build.gradle +++ b/dd-java-agent/instrumentation/vertx/vertx-rx-3.5/build.gradle @@ -5,7 +5,7 @@ addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test') apply from: "$rootDir/gradle/configure_tests.gradle" -latestDepTest { +tasks.named("latestDepTest", Test) { finalizedBy 'latestDepForkedTest' } diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/build.gradle b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/build.gradle index 50b92e36cd3..56f1bf53c32 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/build.gradle +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/build.gradle @@ -20,7 +20,7 @@ addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test') apply from: "$rootDir/gradle/configure_tests.gradle" -latestDepTest { +tasks.named("latestDepTest", Test) { finalizedBy 'latestDepForkedTest' } diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.5/build.gradle b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.5/build.gradle index d00cc7f3b1e..e2fe7548b0d 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.5/build.gradle +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.5/build.gradle @@ -20,7 +20,7 @@ addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test') apply from: "$rootDir/gradle/configure_tests.gradle" -latestDepTest { +tasks.named("latestDepTest", Test) { finalizedBy 'latestDepForkedTest' } diff --git a/dd-java-agent/instrumentation/weaver/build.gradle b/dd-java-agent/instrumentation/weaver/build.gradle index b9edbb0a24e..0a01cfe4963 100644 --- a/dd-java-agent/instrumentation/weaver/build.gradle +++ b/dd-java-agent/instrumentation/weaver/build.gradle @@ -30,17 +30,17 @@ dependencies { weaver084TestImplementation group: 'com.disneystreaming', name: 'weaver-cats_3', version: '0.8.4' } -compileTestGroovy { +tasks.named("compileTestGroovy", GroovyCompile) { dependsOn compileTestScala classpath += files(sourceSets.test.scala.destinationDirectory) } -compileLatestDepTestGroovy { +tasks.named("compileLatestDepTestGroovy", GroovyCompile) { dependsOn compileLatestDepTestScala classpath += files(sourceSets.latestDepTest.scala.destinationDirectory) } -compileWeaver084TestGroovy { +tasks.named("compileWeaver084TestGroovy", GroovyCompile) { dependsOn compileWeaver084TestScala classpath += files(sourceSets.weaver084Test.scala.destinationDirectory) } diff --git a/dd-java-agent/instrumentation/wildfly-9.0/build.gradle b/dd-java-agent/instrumentation/wildfly-9.0/build.gradle index ae469e7c422..b7541780190 100644 --- a/dd-java-agent/instrumentation/wildfly-9.0/build.gradle +++ b/dd-java-agent/instrumentation/wildfly-9.0/build.gradle @@ -101,19 +101,19 @@ def extractLatestWildfly = tasks.register("extractLatestWildfly", Copy) { onlyIf { !project.rootProject.hasProperty("skipTests") } } -tasks.named("test") { +tasks.named("test", Test) { dependsOn 'extractWildfly' } -tasks.named("forkedTest") { +tasks.named("forkedTest", Test) { dependsOn 'extractWildfly' } -tasks.named("latestDepForkedTest") { +tasks.named("latestDepForkedTest", Test) { dependsOn 'extractLatestWildfly' } -tasks.named("latestDepTest") { +tasks.named("latestDepTest", Test) { dependsOn 'extractLatestWildfly' } @@ -136,7 +136,7 @@ tasks.named("compileTestJava", JavaCompile) { } } -processTestResources { +tasks.named("processTestResources", ProcessResources) { filesMatching('**/WEB-INF/web.xml') { expand( 'servletClass': 'test.TestServlet', @@ -144,11 +144,13 @@ processTestResources { } } -[processLatestDepTestResources, processLatestDepForkedTestResources].each { - it.filesMatching('**/WEB-INF/web.xml') { - expand( - 'servletClass': 'test.JakartaTestServlet', - ) +["processLatestDepTestResources", "processLatestDepForkedTestResources"].each { + tasks.named(it, ProcessResources) { + filesMatching('**/WEB-INF/web.xml') { + expand( + 'servletClass': 'test.JakartaTestServlet', + ) + } } }