chore: More laziness on some Gradle jvmArgs

Author: bric3

dd-smoke-tests/spring-security/build.gradle

@@ -32,7 +32,13 @@ dependencies {
 
 
 tasks.withType(Test).configureEach {
-  jvmArgs "-Ddatadog.smoketest.springboot.shadowJar.path=${tasks.jar.archiveFile.get()}"
+  jvmArgumentProviders.add(new CommandLineArgumentProvider() {
+      @Override
+      Iterable<String> asArguments() {
+        def jarTask = tasks.named('jar', Jar).get()
+        return ["-Ddatadog.smoketest.springboot.shadowJar.path=${jarTask.archiveFile.get()}"]
+      }
+    })
 }
 
 tasks.named("processResources", ProcessResources) {

dd-smoke-tests/springboot-jetty-jsp/build.gradle

@@ -1,3 +1,5 @@
+import org.springframework.boot.gradle.tasks.bundling.BootWar
+
 plugins {
   id 'java'
   id 'war'
@@ -34,5 +36,12 @@ dependencies {
 
 tasks.withType(Test).configureEach {
   dependsOn "war", "bootWar"
-  jvmArgs "-Ddatadog.smoketest.springboot.war.path=${tasks.bootWar.archiveFile.get().getAsFile()}"
+
+  jvmArgumentProviders.add(new CommandLineArgumentProvider() {
+      @Override
+      Iterable<String> asArguments() {
+        def bootWarTask = tasks.named('bootWar', BootWar).get()
+        return ["-Ddatadog.smoketest.springboot.war.path=${bootWarTask.archiveFile.get().getAsFile()}"]
+      }
+    })
 }

dd-smoke-tests/springboot-jpa/build.gradle

@@ -1,3 +1,5 @@
+import org.springframework.boot.gradle.tasks.bundling.BootWar
+
 plugins {
   id 'java'
   id 'war'
@@ -27,7 +29,14 @@ dependencies {
 
 tasks.withType(Test).configureEach {
   dependsOn "bootWar"
-  jvmArgs "-Ddatadog.smoketest.springboot.bootWar.path=${tasks.bootWar.archiveFile.get()}"
+
+  jvmArgumentProviders.add(new CommandLineArgumentProvider() {
+      @Override
+      Iterable<String> asArguments() {
+        def bootWarTask = tasks.named('bootWar', BootWar).get()
+        return ["-Ddatadog.smoketest.springboot.bootWar.path=${bootWarTask.archiveFile.get()}"]
+      }
+    })
 }
 
 tasks.withType(GroovyCompile).configureEach {

dd-smoke-tests/springboot-tomcat-jsp/build.gradle

@@ -1,3 +1,5 @@
+import org.springframework.boot.gradle.tasks.bundling.BootWar
+
 plugins {
   id 'java'
   id 'war'
@@ -34,5 +36,12 @@ dependencies {
 
 tasks.withType(Test).configureEach {
   dependsOn "war", "bootWar"
-  jvmArgs "-Ddatadog.smoketest.springboot.war.path=${tasks.bootWar.archiveFile.get().getAsFile()}"
+
+  jvmArgumentProviders.add(new CommandLineArgumentProvider() {
+      @Override
+      Iterable<String> asArguments() {
+        def bootWarTask = tasks.named('bootWar', BootWar).get()
+        return ["-Ddatadog.smoketest.springboot.war.path=${bootWarTask.archiveFile.get().getAsFile()}"]
+      }
+    })
 }

dd-smoke-tests/springboot-tomcat/build.gradle

@@ -1,3 +1,5 @@
+import org.springframework.boot.gradle.tasks.bundling.BootWar
+
 plugins {
   id 'war'
   id 'org.springframework.boot' version '2.5.12'
@@ -110,6 +112,15 @@ tasks.matching({it.name.startsWith('compileTest')}).configureEach {
 
 tasks.withType(Test).configureEach {
   dependsOn "war", "bootWar", "unzip"
-  jvmArgs "-Ddatadog.smoketest.springboot.war.path=${tasks.bootWar.archiveFile.get().getAsFile()}"
-  jvmArgs "-Ddatadog.smoketest.tomcatDir=${buildDir}/apache-${serverName}-${serverVersion}"
+
+  jvmArgumentProviders.add(new CommandLineArgumentProvider() {
+      @Override
+      Iterable<String> asArguments() {
+        def bootWarTask = tasks.named('bootWar', BootWar).get()
+        return [
+          "-Ddatadog.smoketest.springboot.war.path=${bootWarTask.archiveFile.get().getAsFile()}",
+          "-Ddatadog.smoketest.tomcatDir=${layout.buildDirectory.get()}/apache-${serverName}-${serverVersion}"
+        ]
+      }
+    })
 }

dd-smoke-tests/tracer-flare/build.gradle

@@ -14,5 +14,11 @@ dependencies {
 tasks.withType(Test).configureEach {
   dependsOn "jar"
 
-  jvmArgs "-Ddatadog.smoketest.tracer-flare.jar.path=${tasks.jar.archiveFile.get()}"
+  jvmArgumentProviders.add(new CommandLineArgumentProvider() {
+      @Override
+      Iterable<String> asArguments() {
+        def jarTask = tasks.named('jar', Jar).get()
+        return ["-Ddatadog.smoketest.tracer-flare.jar.path=${jarTask.archiveFile.get()}"]
+      }
+    })
 }