Skip to content

Commit e3f0cba

Browse files
bric3bric3
committed
chore: Lazy access to shadowJar
1 parent e24c202 commit e3f0cba

File tree

45 files changed

+450
-89
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+450
-89
lines changed

‎dd-smoke-tests/apm-tracing-disabled/build.gradle‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import org.springframework.boot.gradle.tasks.bundling.BootJar
2+
13
plugins {
24
id 'java'
35
id 'org.springframework.boot' version '2.7.15'
@@ -23,6 +25,12 @@ dependencies {
2325
}
2426

2527
tasks.withType(Test).configureEach {
26-
dependsOn "bootJar"
27-
jvmArgs "-Ddatadog.smoketest.springboot.shadowJar.path=${tasks.bootJar.archiveFile.get()}"
28+
def bootJarTask = tasks.named('bootJar', BootJar)
29+
dependsOn bootJarTask
30+
jvmArgumentProviders.add(new CommandLineArgumentProvider() {
31+
@Override
32+
Iterable<String> asArguments() {
33+
return bootJarTask.map { ["-Ddatadog.smoketest.springboot.shadowJar.path=${it.archiveFile.get()}"] }.get()
34+
}
35+
})
2836
}

‎dd-smoke-tests/appsec/spring-tomcat7/build.gradle‎

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
2+
13
plugins {
24
id 'com.gradleup.shadow'
35
}
@@ -21,14 +23,26 @@ dependencies {
2123
}
2224

2325
tasks.withType(Test).configureEach {
24-
dependsOn "shadowJar"
25-
26-
jvmArgs "-Ddatadog.smoketest.appsec.springtomcat7.shadowJar.path=${tasks.shadowJar.archiveFile.get()}"
26+
def shadowJarTask = tasks.named('shadowJar', ShadowJar)
27+
dependsOn shadowJarTask
28+
29+
jvmArgumentProviders.add(new CommandLineArgumentProvider() {
30+
@Override
31+
Iterable<String> asArguments() {
32+
return shadowJarTask.map { ["-Ddatadog.smoketest.appsec.springtomcat7.shadowJar.path=${it.archiveFile.get()}"] }.get()
33+
}
34+
})
2735
}
2836

2937
tasks.register('testRuntimeActivation', Test) {
30-
jvmArgs '-Dsmoke_test.appsec.enabled=inactive',
31-
"-Ddatadog.smoketest.appsec.springtomcat7.shadowJar.path=${tasks.shadowJar.archiveFile.get()}"
38+
def shadowJarTask = tasks.named('shadowJar', ShadowJar)
39+
jvmArgs '-Dsmoke_test.appsec.enabled=inactive'
40+
jvmArgumentProviders.add(new CommandLineArgumentProvider() {
41+
@Override
42+
Iterable<String> asArguments() {
43+
return shadowJarTask.map { ["-Ddatadog.smoketest.appsec.springtomcat7.shadowJar.path=${it.archiveFile.get()}"] }.get()
44+
}
45+
})
3246
}
3347

3448
tasks.named('check') {

‎dd-smoke-tests/appsec/springboot-graphql/build.gradle‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
2+
13
plugins {
24
id 'com.gradleup.shadow'
35
}
@@ -33,14 +35,26 @@ dependencies {
3335
}
3436

3537
tasks.withType(Test).configureEach {
36-
dependsOn "shadowJar"
38+
def shadowJarTask = tasks.named('shadowJar', ShadowJar)
39+
dependsOn shadowJarTask
3740

38-
jvmArgs "-Ddatadog.smoketest.appsec.springboot-graphql.shadowJar.path=${tasks.shadowJar.archiveFile.get()}"
41+
jvmArgumentProviders.add(new CommandLineArgumentProvider() {
42+
@Override
43+
Iterable<String> asArguments() {
44+
return shadowJarTask.map { ["-Ddatadog.smoketest.appsec.springboot-graphql.shadowJar.path=${it.archiveFile.get()}"] }.get()
45+
}
46+
})
3947
}
4048

4149
tasks.register('testRuntimeActivation', Test) {
42-
jvmArgs '-Dsmoke_test.appsec.enabled=inactive',
43-
"-Ddatadog.smoketest.appsec.springboot-graphql.shadowJar.path=${tasks.shadowJar.archiveFile.get()}"
50+
def shadowJarTask = tasks.named('shadowJar', ShadowJar)
51+
jvmArgs '-Dsmoke_test.appsec.enabled=inactive'
52+
jvmArgumentProviders.add(new CommandLineArgumentProvider() {
53+
@Override
54+
Iterable<String> asArguments() {
55+
return shadowJarTask.map { ["-Ddatadog.smoketest.appsec.springboot-graphql.shadowJar.path=${it.archiveFile.get()}"] }.get()
56+
}
57+
})
4458
}
4559

4660
tasks.named('check') {

‎dd-smoke-tests/appsec/springboot-security/build.gradle‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
2+
13
plugins {
24
id 'java'
35
id 'com.gradleup.shadow'
@@ -39,14 +41,26 @@ dependencies {
3941
}
4042

4143
tasks.withType(Test).configureEach {
42-
dependsOn "shadowJar"
44+
def shadowJarTask = tasks.named('shadowJar', ShadowJar)
45+
dependsOn shadowJarTask
4346

44-
jvmArgs "-Ddatadog.smoketest.appsec.springbootsecurity.shadowJar.path=${tasks.shadowJar.archiveFile.get()}"
47+
jvmArgumentProviders.add(new CommandLineArgumentProvider() {
48+
@Override
49+
Iterable<String> asArguments() {
50+
return shadowJarTask.map { ["-Ddatadog.smoketest.appsec.springbootsecurity.shadowJar.path=${it.archiveFile.get()}"] }.get()
51+
}
52+
})
4553
}
4654

4755
tasks.register('testRuntimeActivation', Test) {
48-
jvmArgs '-Dsmoke_test.appsec.enabled=inactive',
49-
"-Ddatadog.smoketest.appsec.springbootsecurity.shadowJar.path=${tasks.shadowJar.archiveFile.get()}"
56+
def shadowJarTask = tasks.named('shadowJar', ShadowJar)
57+
jvmArgs '-Dsmoke_test.appsec.enabled=inactive'
58+
jvmArgumentProviders.add(new CommandLineArgumentProvider() {
59+
@Override
60+
Iterable<String> asArguments() {
61+
return shadowJarTask.map { ["-Ddatadog.smoketest.appsec.springbootsecurity.shadowJar.path=${it.archiveFile.get()}"] }.get()
62+
}
63+
})
5064
}
5165

5266
tasks.named('check') {

‎dd-smoke-tests/appsec/springboot/build.gradle‎

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
2+
13
plugins {
24
id 'com.gradleup.shadow'
35
}
@@ -29,14 +31,26 @@ dependencies {
2931
}
3032

3133
tasks.withType(Test).configureEach {
32-
dependsOn "shadowJar"
33-
34-
jvmArgs "-Ddatadog.smoketest.appsec.springboot.shadowJar.path=${tasks.shadowJar.archiveFile.get()}"
34+
def shadowJarTask = tasks.named('shadowJar', ShadowJar)
35+
dependsOn shadowJarTask
36+
37+
jvmArgumentProviders.add(new CommandLineArgumentProvider() {
38+
@Override
39+
Iterable<String> asArguments() {
40+
return shadowJarTask.map { ["-Ddatadog.smoketest.appsec.springboot.shadowJar.path=${it.archiveFile.get()}"] }.get()
41+
}
42+
})
3543
}
3644

3745
tasks.register('testRuntimeActivation', Test) {
38-
jvmArgs '-Dsmoke_test.appsec.enabled=inactive',
39-
"-Ddatadog.smoketest.appsec.springboot.shadowJar.path=${tasks.shadowJar.archiveFile.get()}"
46+
def shadowJarTask = tasks.named('shadowJar', ShadowJar)
47+
jvmArgs '-Dsmoke_test.appsec.enabled=inactive'
48+
jvmArgumentProviders.add(new CommandLineArgumentProvider() {
49+
@Override
50+
Iterable<String> asArguments() {
51+
return shadowJarTask.map { ["-Ddatadog.smoketest.appsec.springboot.shadowJar.path=${it.archiveFile.get()}"] }.get()
52+
}
53+
})
4054
}
4155

4256
tasks.named('check') {

‎dd-smoke-tests/build.gradle‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
2+
13
apply from: "$rootDir/gradle/java.gradle"
24

35
description = 'dd-smoke-tests'
@@ -32,10 +34,16 @@ subprojects { Project subProj ->
3234

3335
subProj.evaluationDependsOn ':dd-java-agent'
3436
subProj.tasks.withType(Test).configureEach { subTask ->
35-
dependsOn project(':dd-java-agent').tasks.named("shadowJar")
37+
def agentTaskRef = project(':dd-java-agent').tasks.named('shadowJar', ShadowJar)
38+
dependsOn agentTaskRef
3639

3740
// Tests depend on this to know where to run things and what agent jar to use
3841
jvmArgs "-Ddatadog.smoketest.builddir=${buildDir}"
39-
jvmArgs "-Ddatadog.smoketest.agent.shadowJar.path=${project(':dd-java-agent').tasks.shadowJar.archiveFile.get()}"
42+
jvmArgumentProviders.add(new CommandLineArgumentProvider() {
43+
@Override
44+
Iterable<String> asArguments() {
45+
return agentTaskRef.map { ["-Ddatadog.smoketest.agent.shadowJar.path=${it.archiveFile.get()}"] }.get()
46+
}
47+
})
4048
}
4149
}

‎dd-smoke-tests/cli/build.gradle‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
2+
13
plugins {
24
id 'com.gradleup.shadow'
35
}
@@ -18,7 +20,13 @@ dependencies {
1820
}
1921

2022
tasks.withType(Test).configureEach {
21-
dependsOn "shadowJar"
23+
def shadowTaskRef = tasks.named('shadowJar', ShadowJar)
24+
dependsOn shadowTaskRef
2225

23-
jvmArgs "-Ddatadog.smoketest.cli.shadowJar.path=${tasks.shadowJar.archiveFile.get()}"
26+
jvmArgumentProviders.add(new CommandLineArgumentProvider() {
27+
@Override
28+
Iterable<String> asArguments() {
29+
return shadowTaskRef.map { ["-Ddatadog.smoketest.cli.shadowJar.path=${it.archiveFile.get()}"] }.get()
30+
}
31+
})
2432
}

‎dd-smoke-tests/concurrent/java-21/build.gradle‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
2+
13
plugins {
24
id 'application'
35
id 'com.gradleup.shadow'
@@ -44,6 +46,12 @@ dependencies {
4446
}
4547

4648
tasks.withType(Test).configureEach {
47-
dependsOn "shadowJar"
48-
jvmArgs "-Ddatadog.smoketest.shadowJar.path=${tasks.shadowJar.archiveFile.get()}"
49+
def shadowJarTask = tasks.named('shadowJar', ShadowJar)
50+
dependsOn shadowJarTask
51+
jvmArgumentProviders.add(new CommandLineArgumentProvider() {
52+
@Override
53+
Iterable<String> asArguments() {
54+
return shadowJarTask.map { ["-Ddatadog.smoketest.shadowJar.path=${it.archiveFile.get()}"] }.get()
55+
}
56+
})
4957
}

‎dd-smoke-tests/concurrent/java-25/build.gradle‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
2+
13
plugins {
24
id 'application'
35
id 'com.gradleup.shadow'
@@ -57,6 +59,12 @@ dependencies {
5759
}
5860

5961
tasks.withType(Test).configureEach {
60-
dependsOn "shadowJar"
61-
jvmArgs "-Ddatadog.smoketest.shadowJar.path=${tasks.shadowJar.archiveFile.get()}"
62+
def shadowJarTask = tasks.named('shadowJar', ShadowJar)
63+
dependsOn shadowJarTask
64+
jvmArgumentProviders.add(new CommandLineArgumentProvider() {
65+
@Override
66+
Iterable<String> asArguments() {
67+
return shadowJarTask.map { ["-Ddatadog.smoketest.shadowJar.path=${it.archiveFile.get()}"] }.get()
68+
}
69+
})
6270
}

‎dd-smoke-tests/concurrent/java-8/build.gradle‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
2+
13
plugins {
24
id 'application'
35
id 'com.gradleup.shadow'
@@ -18,6 +20,12 @@ dependencies {
1820

1921

2022
tasks.withType(Test).configureEach {
21-
dependsOn "shadowJar"
22-
jvmArgs "-Ddatadog.smoketest.shadowJar.path=${tasks.shadowJar.archiveFile.get()}"
23+
def shadowJarTask = tasks.named('shadowJar', ShadowJar)
24+
dependsOn shadowJarTask
25+
jvmArgumentProviders.add(new CommandLineArgumentProvider() {
26+
@Override
27+
Iterable<String> asArguments() {
28+
return shadowJarTask.map { ["-Ddatadog.smoketest.shadowJar.path=${it.archiveFile.get()}"] }.get()
29+
}
30+
})
2331
}

0 commit comments

Comments
 (0)