Skip to content

Commit 1fdc913

Browse files
Fixed nested folders
1 parent c3b64a6 commit 1fdc913

File tree

13 files changed

+11
-41
lines changed

13 files changed

+11
-41
lines changed

dd-smoke-tests/armeria-grpc/application/build.gradle

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,10 @@ buildscript {
77
plugins {
88
id 'application'
99
id 'java'
10-
id 'com.diffplug.spotless' version '8.0.0'
1110
id 'com.gradleup.shadow' version '8.3.6'
1211
id 'com.google.protobuf' version '0.9.3'
1312
}
1413

15-
spotless {
16-
java {
17-
18-
// TODO: for some reason `armeriaBuild` is failing with NoClassDefFoundError.
19-
suppressLintsFor {
20-
step = "toggle"
21-
shortCode = "java.lang.NoClassDefFoundError"
22-
}
23-
}
24-
}
25-
2614
def sharedRootDir = "$rootDir/../../../"
2715
def sharedConfigDirectory = "$sharedRootDir/gradle"
2816
rootProject.ext.sharedConfigDirectory = sharedConfigDirectory

dd-smoke-tests/kafka-3/application/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ plugins {
22
id 'java'
33
id 'org.springframework.boot' version '3.2.2'
44
id 'io.spring.dependency-management' version '1.1.4'
5-
id 'com.diffplug.spotless' version '8.0.0'
65
}
76

87
java {

dd-smoke-tests/kafka-3/build.gradle

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,13 @@ tasks.named('compileTestGroovy') {
5151
tasks.withType(Test).configureEach {
5252
jvmArgs "-Ddatadog.smoketest.springboot.shadowJar.path=${appBuildDir}/libs/kafka-3-smoketest.jar"
5353
}
54+
55+
spotless {
56+
java {
57+
target "**/*.java"
58+
}
59+
60+
groovyGradle {
61+
target '*.gradle', "**/*.gradle"
62+
}
63+
}

dd-smoke-tests/quarkus-native/application/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
plugins {
22
id 'java'
33
id 'io.quarkus'
4-
id 'com.diffplug.spotless' version '8.0.0'
54
}
65

76
def sharedRootDir = "$rootDir/../../../"

dd-smoke-tests/quarkus/application/build.gradle

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
plugins {
22
id 'java'
33
id 'io.quarkus'
4-
id 'com.diffplug.spotless' version '8.0.0'
5-
}
6-
7-
java {
8-
toolchain {
9-
languageVersion.set(JavaLanguageVersion.of(8))
10-
}
114
}
125

136
def sharedRootDir = "$rootDir/../../../"

dd-smoke-tests/quarkus/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def gradlewCommand = isWindows ? 'gradlew.bat' : 'gradlew'
1717
// define the task that builds the quarkus project
1818
tasks.register('quarkusBuild', Exec) {
1919
workingDir "$appDir"
20-
environment.JAVA_HOME = System.getenv("JAVA_21_HOME")
20+
environment.JAVA_HOME = System.getenv("JAVA_8_HOME")
2121
environment += ["GRADLE_OPTS": "-Dorg.gradle.jvmargs='-Xmx512M'"]
2222
commandLine "${rootDir}/${gradlewCommand}", "build", "--no-daemon", "--max-workers=4", "-PappBuildDir=$appBuildDir", "-PapiJar=${project(':dd-trace-api').tasks.jar.archiveFile.get()}"
2323

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ def gradlewCommand = isWindows ? 'gradlew.bat' : 'gradlew'
4747
// define the task that builds the quarkus project
4848
tasks.register('earBuild', Exec) {
4949
workingDir "$appDir"
50-
environment.JAVA_HOME = System.getenv("JAVA_21_HOME")
5150
environment += ["GRADLE_OPTS": "-Dorg.gradle.jvmargs='-Xmx512M'"]
5251
commandLine "$rootDir/${gradlewCommand}", "assemble", "--no-daemon", "--max-workers=4", "-PappBuildDir=$appBuildDir", "-PapiJar=${project(':dd-trace-api').tasks.jar.archiveFile.get()}"
5352

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
plugins {
22
id 'java'
33
id 'ear'
4-
id 'com.diffplug.spotless' version '8.0.0'
5-
}
6-
7-
java {
8-
toolchain {
9-
languageVersion = JavaLanguageVersion.of(8)
10-
}
114
}
125

136
def sharedRootDir = "$rootDir/../../../../"

dd-smoke-tests/spring-boot-2.7-webflux/application/build.gradle

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,6 @@ plugins {
22
id 'java'
33
id 'org.springframework.boot' version '2.7.4'
44
id 'io.spring.dependency-management' version '1.0.14.RELEASE'
5-
id 'com.diffplug.spotless' version '8.0.0'
6-
}
7-
8-
java {
9-
toolchain {
10-
languageVersion = JavaLanguageVersion.of(8)
11-
}
125
}
136

147
def sharedRootDir = "$rootDir/../../../"

dd-smoke-tests/spring-boot-3.0-native/application/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ plugins {
33
id 'org.springframework.boot' version '3.0.0'
44
id 'io.spring.dependency-management' version '1.0.14.RELEASE'
55
id 'org.graalvm.buildtools.native' version '0.9.28'
6-
id 'com.diffplug.spotless' version '8.0.0'
76
}
87

98
def sharedRootDir = "$rootDir/../../../"

0 commit comments

Comments
 (0)