Skip to content

Commit 7378d5b

Browse files
committed
Remove gradle spring boot plugin usage from common smoke test modules
1 parent c7dd764 commit 7378d5b

File tree

3 files changed

+10
-22
lines changed

3 files changed

+10
-22
lines changed

smoke-tests-otel-starter/spring-boot-common/build.gradle.kts

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
1-
import org.springframework.boot.gradle.tasks.bundling.BootJar
2-
31
plugins {
42
id("otel.java-conventions")
5-
id("org.springframework.boot") version "2.6.15"
63
}
74

85
description = "smoke-tests-otel-starter-spring-boot-common"
96

107
dependencies {
118
// spring dependencies are compile only to enable testing against different versions of spring
12-
compileOnly(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES))
9+
compileOnly(platform("org.springframework.boot:spring-boot-dependencies:2.6.15"))
1310
compileOnly("org.springframework.boot:spring-boot-starter-web")
1411
compileOnly("org.springframework.boot:spring-boot-starter-test")
1512
compileOnly("org.springframework.boot:spring-boot-starter-data-jdbc")
@@ -27,6 +24,11 @@ dependencies {
2724
implementation(project(":instrumentation:spring:starters:spring-boot-starter"))
2825
}
2926

30-
tasks.withType<BootJar> {
31-
enabled = false
27+
tasks {
28+
compileJava {
29+
with(options) {
30+
// preserve parameter names for @SpanAttribute
31+
compilerArgs.add("-parameters")
32+
}
33+
}
3234
}
Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,15 @@
1-
import org.springframework.boot.gradle.tasks.bundling.BootJar
2-
31
plugins {
42
id("otel.java-conventions")
5-
id("org.springframework.boot") version "2.6.15"
63
}
74

85
description = "smoke-tests-otel-starter-spring-boot-reactive-common"
96

107
dependencies {
118
// spring dependencies are compile only to enable testing against different versions of spring
12-
compileOnly(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES))
9+
compileOnly(platform("org.springframework.boot:spring-boot-dependencies:2.6.15"))
1310
compileOnly("org.springframework.boot:spring-boot-starter-web")
1411
compileOnly("org.springframework.boot:spring-boot-starter-webflux")
1512
compileOnly("org.springframework.boot:spring-boot-starter-test")
1613
compileOnly("org.springframework.boot:spring-boot-starter-data-r2dbc")
1714
api(project(":smoke-tests-otel-starter:spring-smoke-testing"))
1815
}
19-
20-
tasks.withType<BootJar> {
21-
enabled = false
22-
}
Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,15 @@
1-
import org.springframework.boot.gradle.tasks.bundling.BootJar
2-
31
plugins {
42
id("otel.java-conventions")
5-
id("org.springframework.boot") version "2.6.15"
63
}
74

85
description = "smoke-tests-otel-starter-spring-smoke-testing"
96

107
dependencies {
118
// spring dependencies are compile only to enable testing against different versions of spring
12-
compileOnly(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES))
9+
compileOnly(platform("org.springframework.boot:spring-boot-dependencies:2.6.15"))
1310
compileOnly("org.springframework.boot:spring-boot-starter")
1411
compileOnly("org.springframework.boot:spring-boot-starter-test")
1512
api(project(":testing-common"))
1613
api("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi")
1714
implementation("com.google.guava:guava")
1815
}
19-
20-
tasks.withType<BootJar> {
21-
enabled = false
22-
}

0 commit comments

Comments
 (0)