Skip to content

Commit f5da4c0

Browse files
authored
Remove spring boot gradle plugin from boot 2 tests (#14522)
1 parent 98072b9 commit f5da4c0

File tree

3 files changed

+4
-14
lines changed

3 files changed

+4
-14
lines changed

settings.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ dependencyResolutionManagement {
4141
plugin("versions", "org.springframework.boot").version(version)
4242
}
4343
}
44-
// r2dbc is not compatible with earlier versions
45-
addSpringBootCatalog("springBoot2", "2.6.15", "2.+")
4644
// spring boot 3.0 is not compatible with graalvm native image
4745
addSpringBootCatalog("springBoot31", "3.1.0", "3.+")
4846
addSpringBootCatalog("springBoot32", "3.2.0", "3.+")

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
plugins {
22
id("otel.java-conventions")
3-
alias(springBoot2.plugins.versions)
43
}
54

65
description = "smoke-tests-otel-starter-spring-boot-2"
@@ -13,7 +12,8 @@ dependencies {
1312
implementation("org.springframework.kafka:spring-kafka")
1413
implementation("org.springframework.boot:spring-boot-starter-data-mongodb")
1514
implementation("org.springframework.boot:spring-boot-starter-aop")
16-
implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES))
15+
val testLatestDeps = gradle.startParameter.projectProperties["testLatestDeps"] == "true"
16+
implementation(platform("org.springframework.boot:spring-boot-dependencies:" + if (testLatestDeps) "2.+" else "2.6.15"))
1717

1818
implementation(project(":smoke-tests-otel-starter:spring-boot-common"))
1919

@@ -23,10 +23,6 @@ dependencies {
2323
testImplementation("org.springframework.boot:spring-boot-starter-test")
2424
}
2525

26-
springBoot {
27-
mainClass = "io.opentelemetry.spring.smoketest.OtelSpringStarterSmokeTestApplication"
28-
}
29-
3026
configurations.configureEach {
3127
resolutionStrategy {
3228
// our dependency management pins to a version that is not compatible with spring boot 2.7

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
plugins {
22
id("otel.java-conventions")
3-
alias(springBoot2.plugins.versions)
43
}
54

65
description = "smoke-tests-otel-starter-spring-boot-reactive-2"
76

87
dependencies {
98
implementation(project(":instrumentation:spring:starters:spring-boot-starter"))
10-
implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES))
9+
val testLatestDeps = gradle.startParameter.projectProperties["testLatestDeps"] == "true"
10+
implementation(platform("org.springframework.boot:spring-boot-dependencies:" + if (testLatestDeps) "2.+" else "2.6.15"))
1111

1212
implementation(project(":smoke-tests-otel-starter:spring-boot-reactive-common"))
1313
implementation("org.springframework.boot:spring-boot-starter-webflux")
@@ -20,10 +20,6 @@ dependencies {
2020
testImplementation("io.projectreactor:reactor-test")
2121
}
2222

23-
springBoot {
24-
mainClass = "io.opentelemetry.spring.smoketest.OtelReactiveSpringStarterSmokeTestApplication"
25-
}
26-
2723
configurations.configureEach {
2824
resolutionStrategy {
2925
// our dependency management pins to a version that is not compatible with spring boot 2.7

0 commit comments

Comments
 (0)