Skip to content

Commit 72a7685

Browse files
committed
Update smoke test tasks N-R
1 parent faca8da commit 72a7685

File tree

9 files changed

+14
-10
lines changed

9 files changed

+14
-10
lines changed

dd-smoke-tests/osgi/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ dependencies {
4242
testImplementation project(':dd-smoke-tests')
4343
}
4444

45-
jar {
45+
tasks.named("jar", Jar) {
4646
include 'datadog/smoketest/osgi/app/**'
4747
}
4848

dd-smoke-tests/profiling-integration-tests/build.gradle

Lines changed: 4 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
}
@@ -10,7 +12,7 @@ apply from: "$rootDir/gradle/java.gradle"
1012

1113
description = 'Profiling Integration Tests.'
1214

13-
jar {
15+
tasks.named("jar", Jar) {
1416
manifest {
1517
attributes('Main-Class': 'datadog.smoketest.profiling.ProfilingTestApplication')
1618
}
@@ -43,7 +45,7 @@ tasks.withType(Test).configureEach {
4345
}
4446
}
4547

46-
shadowJar {
48+
tasks.named("shadowJar", ShadowJar) {
4749
include {
4850
return it.directory || it.path.endsWith('.jar') ||
4951
it.path.startsWith('io/opentracing') ||

dd-smoke-tests/quarkus/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ tasks.register('quarkusBuild', Exec) {
3434
}
3535

3636
evaluationDependsOn ':dd-trace-api'
37-
quarkusBuild {
37+
38+
tasks.named("quarkusBuild") {
3839
dependsOn project(':dd-trace-api').tasks.named("jar")
3940
}
4041

dd-smoke-tests/ratpack-1.5/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44

55
apply from: "$rootDir/gradle/java.gradle"
66

7-
jar {
7+
tasks.named("jar", Jar) {
88
manifest {
99
attributes('Main-Class': 'datadog.smoketest.ratpack.RatpackApp')
1010
}

dd-smoke-tests/resteasy/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66
apply from: "$rootDir/gradle/java.gradle"
77
description = 'RestEasy Smoke Test.'
88

9-
jar {
9+
tasks.named("jar", Jar) {
1010
manifest {
1111
attributes "Main-Class": "smoketest.resteasy.Main"
1212
}

dd-smoke-tests/rum/tomcat-10/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dependencies {
1717
testImplementation project(':dd-smoke-tests:rum')
1818
}
1919

20-
jar {
20+
tasks.named("jar", Jar) {
2121
manifest {
2222
attributes('Main-Class': 'com.example.Main')
2323
}

dd-smoke-tests/rum/tomcat-11/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dependencies {
1717
testImplementation project(':dd-smoke-tests:rum')
1818
}
1919

20-
jar {
20+
tasks.named("jar", Jar) {
2121
manifest {
2222
attributes('Main-Class': 'com.example.Main')
2323
}
@@ -28,6 +28,7 @@ java {
2828
languageVersion = JavaLanguageVersion.of(17)
2929
}
3030
}
31+
3132
tasks.withType(JavaCompile).configureEach {
3233
setJavaVersion(it, 17)
3334
sourceCompatibility = JavaVersion.VERSION_17

dd-smoke-tests/rum/tomcat-9/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ dependencies {
1313
testImplementation project(':dd-smoke-tests:rum')
1414
}
1515

16-
jar {
16+
tasks.named("jar", Jar) {
1717
manifest {
1818
attributes('Main-Class': 'com.example.Main')
1919
}

dd-smoke-tests/rum/wildfly-15/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ tasks.register('earBuild', Exec) {
6363
.withPathSensitivity(PathSensitivity.RELATIVE)
6464
}
6565

66-
earBuild {
66+
tasks.named("earBuild") {
6767
dependsOn project(':dd-trace-api').tasks.named("jar")
6868
}
6969

0 commit comments

Comments
 (0)