Update smoke test tasks S-Z

sarahchen6 · sarahchen6 · commit b7a656acc9a3 · 2025-09-25T11:59:37.000-04:00
diff --git a/dd-smoke-tests/spring-boot-2.3-webmvc-jetty/build.gradle b/dd-smoke-tests/spring-boot-2.3-webmvc-jetty/build.gradle
@@ -2,21 +2,21 @@ plugins {
   id 'com.gradleup.shadow'
 }
 
-
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import com.github.jengelman.gradle.plugins.shadow.transformers.PropertiesFileTransformer
 
 apply from: "$rootDir/gradle/java.gradle"
 description = 'Spring Boot 2.3 Jetty Smoke Tests.'
 
 // The standard spring-boot plugin doesn't play nice with our project
 // so we'll build a fat jar instead
-jar {
+tasks.named("jar", Jar) {
   manifest {
     attributes('Main-Class': 'datadog.smoketest.springboot.SpringbootApplication')
   }
 }
 
-shadowJar {
+tasks.named("shadowJar", ShadowJar) {
   configurations = [project.configurations.runtimeClasspath]
   mergeServiceFiles()
   append 'META-INF/spring.handlers'
diff --git a/dd-smoke-tests/spring-boot-2.4-webflux/build.gradle b/dd-smoke-tests/spring-boot-2.4-webflux/build.gradle
@@ -1,3 +1,5 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
 plugins {
   id 'com.gradleup.shadow'
 }
@@ -7,13 +9,13 @@ description = 'Spring Boot 2.4 Webflux Smoke Tests.'
 
 // The standard spring-boot plugin doesn't play nice with our project
 // so we'll build a fat jar instead
-jar {
+tasks.named("jar", Jar) {
   manifest {
     attributes('Main-Class': 'datadog.smoketest.springboot.SpringbootApplication')
   }
 }
 
-shadowJar {
+tasks.named("shadowJar", ShadowJar) {
   configurations = [project.configurations.runtimeClasspath]
 }
 
diff --git a/dd-smoke-tests/spring-boot-2.5-webflux/build.gradle b/dd-smoke-tests/spring-boot-2.5-webflux/build.gradle
@@ -1,3 +1,5 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
 plugins {
   id 'com.gradleup.shadow'
 }
@@ -7,13 +9,13 @@ description = 'Spring Boot 2.5 Webflux Smoke Tests.'
 
 // The standard spring-boot plugin doesn't play nice with our project
 // so we'll build a fat jar instead
-jar {
+tasks.named("jar", Jar) {
   manifest {
     attributes('Main-Class': 'datadog.smoketest.springboot.SpringbootApplication')
   }
 }
 
-shadowJar {
+tasks.named("shadowJar", ShadowJar) {
   configurations = [project.configurations.runtimeClasspath]
 }
 
diff --git a/dd-smoke-tests/spring-boot-2.6-webflux/build.gradle b/dd-smoke-tests/spring-boot-2.6-webflux/build.gradle
@@ -1,3 +1,4 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import com.github.jengelman.gradle.plugins.shadow.transformers.PropertiesFileTransformer
 
 plugins {
@@ -9,13 +10,13 @@ description = 'Spring Boot 2.6 Webflux Smoke Tests.'
 
 // The standard spring-boot plugin doesn't play nice with our project
 // so we'll build a fat jar instead
-jar {
+tasks.named("jar", Jar) {
   manifest {
     attributes('Main-Class': 'datadog.smoketest.springboot.SpringbootApplication')
   }
 }
 
-shadowJar {
+tasks.named("shadowJar", ShadowJar) {
   configurations = [project.configurations.runtimeClasspath]
   mergeServiceFiles()
   append 'META-INF/spring.handlers'
diff --git a/dd-smoke-tests/spring-boot-2.6-webmvc/build.gradle b/dd-smoke-tests/spring-boot-2.6-webmvc/build.gradle
@@ -3,21 +3,21 @@ plugins {
   id 'java-test-fixtures'
 }
 
-
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import com.github.jengelman.gradle.plugins.shadow.transformers.PropertiesFileTransformer
 
 apply from: "$rootDir/gradle/java.gradle"
 description = 'Spring Boot 2.6 Webmvc Smoke Tests.'
 
 // The standard spring-boot plugin doesn't play nice with our project
 // so we'll build a fat jar instead
-jar {
+tasks.named("jar", Jar) {
   manifest {
     attributes('Main-Class': 'datadog.smoketest.springboot.SpringbootApplication')
   }
 }
 
-shadowJar {
+tasks.named("shadowJar", ShadowJar) {
   configurations = [project.configurations.runtimeClasspath]
   mergeServiceFiles()
   append 'META-INF/spring.handlers'
diff --git a/dd-smoke-tests/spring-boot-2.7-webflux/build.gradle b/dd-smoke-tests/spring-boot-2.7-webflux/build.gradle
@@ -1,4 +1,3 @@
-
 apply from: "$rootDir/gradle/java.gradle"
 
 description = 'Spring Boot 2.7 Webflux Smoke Tests.'
@@ -31,7 +30,7 @@ tasks.register('webfluxBuild', Exec) {
   .withPathSensitivity(PathSensitivity.RELATIVE)
 }
 
-webfluxBuild {
+tasks.named("webfluxBuild", Exec) {
   dependsOn project(':dd-trace-api').tasks.named("jar")
 }
 
diff --git a/dd-smoke-tests/spring-boot-3.0-webflux/build.gradle b/dd-smoke-tests/spring-boot-3.0-webflux/build.gradle
@@ -35,7 +35,7 @@ tasks.register('webfluxBuild30', Exec) {
   .withPathSensitivity(PathSensitivity.RELATIVE)
 }
 
-webfluxBuild30 {
+tasks.named("webfluxBuild30", Exec) {
   dependsOn project(':dd-trace-api').tasks.named("jar")
 }
 
diff --git a/dd-smoke-tests/spring-boot-3.0-webmvc/build.gradle b/dd-smoke-tests/spring-boot-3.0-webmvc/build.gradle
@@ -35,11 +35,8 @@ tasks.register('webmvcBuild30', Exec) {
   .withPathSensitivity(PathSensitivity.RELATIVE)
 }
 
-compileTestGroovy {
+tasks.named("compileTestGroovy", GroovyCompile) {
   dependsOn project(':dd-trace-api').tasks.named("jar")
-}
-
-tasks.named("compileTestGroovy") {
   dependsOn 'webmvcBuild30'
   outputs.upToDateWhen {
     !webmvcBuild30.didWork
diff --git a/dd-smoke-tests/spring-boot-3.3-webmvc/build.gradle b/dd-smoke-tests/spring-boot-3.3-webmvc/build.gradle
@@ -35,11 +35,8 @@ tasks.register('webmvcBuild3', Exec) {
   .withPathSensitivity(PathSensitivity.RELATIVE)
 }
 
-compileTestGroovy {
+tasks.named("compileTestGroovy", GroovyCompile) {
   dependsOn project(':dd-trace-api').tasks.named("jar")
-}
-
-tasks.named("compileTestGroovy") {
   dependsOn 'webmvcBuild3'
   outputs.upToDateWhen {
     !webmvcBuild3.didWork
diff --git a/dd-smoke-tests/spring-boot-rabbit/build.gradle b/dd-smoke-tests/spring-boot-rabbit/build.gradle
@@ -1,3 +1,5 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
 plugins {
   id 'com.gradleup.shadow'
 }
@@ -7,13 +9,13 @@ description = 'SpringBoot RabbitMQ Smoke Tests.'
 
 // The standard spring-boot plugin doesn't play nice with our project
 // so we'll build a fat jar instead
-jar {
+tasks.named("jar", Jar) {
   manifest {
     attributes('Main-Class': 'datadog.smoketest.springboot.SpringbootApplication')
   }
 }
 
-shadowJar {
+tasks.named("shadowJar", ShadowJar) {
   configurations = [project.configurations.runtimeClasspath]
 }
 
diff --git a/dd-smoke-tests/spring-security/build.gradle b/dd-smoke-tests/spring-security/build.gradle
@@ -11,7 +11,7 @@ description = 'Spring Security Smoke Tests.'
 
 // The standard spring-boot plugin doesn't play nice with our project
 // so we'll build a fat jar instead
-jar {
+tasks.named("jar", Jar) {
   manifest {
     attributes('Main-Class': 'com.example.jwt.SecurityJwtDemoApplication')
   }
@@ -35,7 +35,7 @@ tasks.withType(Test).configureEach {
   jvmArgs "-Ddatadog.smoketest.springboot.shadowJar.path=${tasks.jar.archiveFile.get()}"
 }
 
-processResources {
+tasks.named("processResources", ProcessResources) {
   doFirst {
     def resourcesDir = sourceSets.main.output.resourcesDir
     resourcesDir.mkdirs()
diff --git a/dd-smoke-tests/springboot-grpc/build.gradle b/dd-smoke-tests/springboot-grpc/build.gradle
@@ -1,3 +1,5 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
 plugins {
   id 'com.gradleup.shadow'
   id 'com.google.protobuf' version '0.8.18'
@@ -31,13 +33,13 @@ protobuf {
 
 // The standard spring-boot plugin doesn't play nice with our project
 // so we'll build a fat jar instead
-jar {
+tasks.named("jar", Jar) {
   manifest {
     attributes('Main-Class': 'datadog.smoketest.springboot.SpringbootGrpcApplication')
   }
 }
 
-shadowJar {
+tasks.named("shadowJar", ShadowJar) {
   configurations = [project.configurations.runtimeClasspath]
 }
 
diff --git a/dd-smoke-tests/springboot-java-11/build.gradle b/dd-smoke-tests/springboot-java-11/build.gradle
@@ -29,7 +29,7 @@ tasks.named("compileJava", JavaCompile) {
   targetCompatibility = JavaVersion.VERSION_11
 }
 
-forbiddenApisMain {
+tasks.named("forbiddenApisMain") {
   failOnMissingClasses = false
 }
 
diff --git a/dd-smoke-tests/springboot-java-17/build.gradle b/dd-smoke-tests/springboot-java-17/build.gradle
@@ -29,7 +29,7 @@ tasks.named("compileJava", JavaCompile) {
   targetCompatibility = JavaVersion.VERSION_17
 }
 
-forbiddenApisMain {
+tasks.named("forbiddenApisMain") {
   failOnMissingClasses = false
 }
 
diff --git a/dd-smoke-tests/springboot-mongo/build.gradle b/dd-smoke-tests/springboot-mongo/build.gradle
@@ -1,3 +1,5 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
 plugins {
   id 'com.gradleup.shadow'
 }
@@ -7,13 +9,13 @@ description = 'SpringBoot Spring-Data-Mongo Smoke Tests.'
 
 // The standard spring-boot plugin doesn't play nice with our project
 // so we'll build a fat jar instead
-jar {
+tasks.named("jar", Jar) {
   manifest {
     attributes('Main-Class': 'datadog.smoketest.springboot.SpringbootApplication')
   }
 }
 
-shadowJar {
+tasks.named("shadowJar", ShadowJar) {
   configurations = [project.configurations.runtimeClasspath]
 }
 
diff --git a/dd-smoke-tests/springboot-openliberty-23/build.gradle b/dd-smoke-tests/springboot-openliberty-23/build.gradle
@@ -1,4 +1,3 @@
-
 apply from: "$rootDir/gradle/java.gradle"
 description = 'SpringBoot Open Liberty Smoke Tests'
 
diff --git a/dd-smoke-tests/springboot/build.gradle b/dd-smoke-tests/springboot/build.gradle
@@ -12,7 +12,7 @@ description = 'SpringBoot Smoke Tests.'
 
 // The standard spring-boot plugin doesn't play nice with our project
 // so we'll build a fat jar instead
-jar {
+tasks.named("jar", Jar) {
   manifest {
     attributes('Main-Class': 'datadog.smoketest.springboot.SpringbootApplication')
   }
diff --git a/dd-smoke-tests/tracer-flare/build.gradle b/dd-smoke-tests/tracer-flare/build.gradle
@@ -1,7 +1,7 @@
 apply from: "$rootDir/gradle/java.gradle"
 description = 'Tracer Flare Smoke Tests.'
 
-jar {
+tasks.named("jar", Jar) {
   manifest {
     attributes('Main-Class': 'datadog.smoketest.flare.SimpleApp')
   }
diff --git a/dd-smoke-tests/vertx-3.4/build.gradle b/dd-smoke-tests/vertx-3.4/build.gradle
@@ -34,7 +34,7 @@ tasks.register('vertxBuild', Exec) {
   .withPathSensitivity(PathSensitivity.RELATIVE)
 }
 
-vertxBuild {
+tasks.named("vertxBuild", Exec) {
   dependsOn project(':dd-trace-api').tasks.named("jar")
 }
 
diff --git a/dd-smoke-tests/vertx-3.9-resteasy/build.gradle b/dd-smoke-tests/vertx-3.9-resteasy/build.gradle
@@ -31,7 +31,7 @@ tasks.register('vertxBuild', Exec) {
   .withPathSensitivity(PathSensitivity.RELATIVE)
 }
 
-vertxBuild {
+tasks.named("vertxBuild", Exec) {
   dependsOn project(':dd-trace-api').tasks.named("jar")
 }
 
diff --git a/dd-smoke-tests/vertx-3.9/build.gradle b/dd-smoke-tests/vertx-3.9/build.gradle
@@ -32,7 +32,7 @@ tasks.register('vertxBuild', Exec) {
   .withPathSensitivity(PathSensitivity.RELATIVE)
 }
 
-vertxBuild {
+tasks.named("vertxBuild", Exec) {
   dependsOn project(':dd-trace-api').tasks.named("jar")
 }
 
diff --git a/dd-smoke-tests/vertx-4.2/build.gradle b/dd-smoke-tests/vertx-4.2/build.gradle
@@ -33,7 +33,7 @@ tasks.register('vertxBuild', Exec) {
   .withPathSensitivity(PathSensitivity.RELATIVE)
 }
 
-vertxBuild {
+tasks.named("vertxBuild", Exec) {
   dependsOn project(':dd-trace-api').tasks.named("jar")
 }
 
diff --git a/dd-smoke-tests/wildfly/build.gradle b/dd-smoke-tests/wildfly/build.gradle
@@ -63,7 +63,7 @@ tasks.register('earBuild', Exec) {
   .withPathSensitivity(PathSensitivity.RELATIVE)
 }
 
-earBuild {
+tasks.named("earBuild", Exec) {
   dependsOn project(':dd-trace-api').tasks.named("jar")
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar`
	`2`	`+`
`1`	`3`	`plugins {`
`2`	`4`	`id 'com.gradleup.shadow'`
`3`	`5`	`}`
`@@ -7,13 +9,13 @@ description = 'Spring Boot 2.4 Webflux Smoke Tests.'`
`7`	`9`
`8`	`10`	`// The standard spring-boot plugin doesn't play nice with our project`
`9`	`11`	`// so we'll build a fat jar instead`
`10`		`-jar {`
	`12`	`+tasks.named("jar", Jar) {`
`11`	`13`	`manifest {`
`12`	`14`	`attributes('Main-Class': 'datadog.smoketest.springboot.SpringbootApplication')`
`13`	`15`	`}`
`14`	`16`	`}`
`15`	`17`
`16`		`-shadowJar {`
	`18`	`+tasks.named("shadowJar", ShadowJar) {`
`17`	`19`	`configurations = [project.configurations.runtimeClasspath]`
`18`	`20`	`}`
`19`	`21`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-`
`2`	`1`	`apply from: "$rootDir/gradle/java.gradle"`
`3`	`2`
`4`	`3`	`description = 'Spring Boot 2.7 Webflux Smoke Tests.'`
`@@ -31,7 +30,7 @@ tasks.register('webfluxBuild', Exec) {`
`31`	`30`	`.withPathSensitivity(PathSensitivity.RELATIVE)`
`32`	`31`	`}`
`33`	`32`
`34`		`-webfluxBuild {`
	`33`	`+tasks.named("webfluxBuild", Exec) {`
`35`	`34`	`dependsOn project(':dd-trace-api').tasks.named("jar")`
`36`	`35`	`}`
`37`	`36`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ tasks.register('webfluxBuild30', Exec) {`
`35`	`35`	`.withPathSensitivity(PathSensitivity.RELATIVE)`
`36`	`36`	`}`
`37`	`37`
`38`		`-webfluxBuild30 {`
	`38`	`+tasks.named("webfluxBuild30", Exec) {`
`39`	`39`	`dependsOn project(':dd-trace-api').tasks.named("jar")`
`40`	`40`	`}`
`41`	`41`