Skip to content

Commit faca8da

Browse files
committed
Update smoke test tasks D-M
1 parent 9049985 commit faca8da

File tree

12 files changed

+20
-14
lines changed

12 files changed

+20
-14
lines changed

dd-smoke-tests/datastreams/kafkaschemaregistry/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ apply from: "$rootDir/gradle/java.gradle"
88
apply from: "$rootDir/gradle/spring-boot-plugin.gradle"
99
description = 'Kafka Smoke Tests.'
1010

11-
jar {
11+
tasks.named("jar", Jar) {
1212
manifest {
1313
attributes('Main-Class': 'datadog.smoketest.datastreams.kafkaschemaregistry.KafkaProducerWithSchemaRegistry')
1414
}

dd-smoke-tests/debugger-integration-tests/latest-jdk-app/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1+
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
2+
13
plugins {
24
// Apply the application plugin to add support for building a CLI application in Java.
35
id 'application'
46
id 'com.gradleup.shadow'
57
}
68

7-
shadowJar {
9+
tasks.named("shadowJar", ShadowJar) {
810
// Define the main class for the application.
911
mainClass = 'App'
1012
}

dd-smoke-tests/field-injection/build.gradle

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
1+
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
2+
13
plugins {
24
id 'com.gradleup.shadow'
35
}
46

57
description = 'Check fields get injected where expected'
68
apply from: "$rootDir/gradle/java.gradle"
79

8-
jar {
10+
tasks.named("jar", Jar) {
911
manifest {
1012
attributes('Main-Class': 'datadog.smoketest.fieldinjection.FieldInjectionApp')
1113
}
1214
}
1315

14-
shadowJar {
16+
tasks.named("shadowJar", ShadowJar) {
1517
configurations = [project.configurations.runtimeClasspath]
1618
}
1719

dd-smoke-tests/gradle/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ dependencies {
1515
testImplementation project(':dd-java-agent:agent-ci-visibility:civisibility-test-fixtures')
1616
}
1717

18-
test {
18+
tasks.named("test", Test) {
1919
testLogging {
2020
events "passed", "skipped", "failed", "standardOut", "standardError"
2121
}

dd-smoke-tests/iast-propagation/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
id 'java'
@@ -11,13 +13,13 @@ description = 'IAST propagation Smoke Tests.'
1113

1214
// The standard spring-boot plugin doesn't play nice with our project
1315
// so we'll build a fat jar instead
14-
jar {
16+
tasks.named("jar", Jar) {
1517
manifest {
1618
attributes('Main-Class': 'datadog.smoketest.springboot.SpringbootApplication')
1719
}
1820
}
1921

20-
shadowJar {
22+
tasks.named("shadowJar", ShadowJar) {
2123
configurations = [project.configurations.runtimeClasspath]
2224
}
2325

dd-smoke-tests/iast-util/iast-util-11/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ tasks.named("compileJava", JavaCompile) {
2727
targetCompatibility = JavaVersion.VERSION_11
2828
}
2929

30-
forbiddenApisMain {
30+
tasks.named("forbiddenApisMain") {
3131
failOnMissingClasses = false
3232
}

dd-smoke-tests/iast-util/iast-util-17/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ tasks.named("compileJava", JavaCompile) {
2727
targetCompatibility = JavaVersion.VERSION_17
2828
}
2929

30-
forbiddenApisMain {
30+
tasks.named("forbiddenApisMain") {
3131
failOnMissingClasses = false
3232
}

dd-smoke-tests/java9-modules/build.gradle

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

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

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

dd-smoke-tests/jersey-2/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 = 'Jersey 2 Smoke Tests.'
88

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

dd-smoke-tests/jersey-3/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 = 'Jersey 3 Smoke Tests.'
88

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

0 commit comments

Comments
 (0)